diff --git a/openair-cn/NAS/EURECOM-NAS/src/util/socket.c b/openair-cn/NAS/EURECOM-NAS/src/util/socket.c
index 12941ea8b5f4c909a89d5264fafaec66806aa5fc..9249890e27aedf61c5eaca0dd8b5353a01aeef8e 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/util/socket.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/util/socket.c
@@ -133,7 +133,8 @@ void* socket_udp_open(int type, const char* host, const char* port)
     else
     {
         /* Setup socket address options at the client side */
-        socket_info.ai_family = AF_UNSPEC; /* Any address family	 */
+        socket_info.ai_family = AF_INET; /* Any address family	 */
+//         socket_info.ai_flags |= AI_V4MAPPED; /* IPv4-mapped IPv6 address */
     }
 
     /*
@@ -180,7 +181,7 @@ void* socket_udp_open(int type, const char* host, const char* port)
         /*
          * Initiate a communication channel at the SERVER side
          */
-        else
+        else {
             if (type == SOCKET_SERVER)
             {
                 /* Set socket options */
@@ -194,6 +195,7 @@ void* socket_udp_open(int type, const char* host, const char* port)
                     break; /* Bind succeed */
                 }
             }
+        }
 
         close (sfd);
     }
diff --git a/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile b/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile
index 8587ffcaeca3dc35d4276f45cee1362bc8bd5cad..c255eac14bb2879a28b938eb916a2837ac2460e9 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile
+++ b/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile
@@ -20,6 +20,7 @@ all: $(TARGET)
 
 $(TARGET): $(OBJS)
 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+	@$(CP) $@ $(BINDIR)
 
 clean:
 	$(RM) $(OBJS) *.bak *~
diff --git a/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile b/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile
index 2ec879459fa486f77d19512aa13b1357766c2fd6..3266315035087702cd296cf5a01aee6dedabff74 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile
+++ b/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile
@@ -20,6 +20,7 @@ all: $(TARGET)
 
 $(TARGET): $(OBJS)
 	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
+	@$(CP) $@ $(BINDIR)
 
 clean:
 	$(RM) $(OBJS) *.bak *~
diff --git a/openair-cn/NAS/EURECOM-NAS/tst/user/Makefile b/openair-cn/NAS/EURECOM-NAS/tst/user/Makefile
index 269c8e91c6a708f72cadc3b75cbb774d7a1c658c..f878d69b02ffec8c63b3efd8557b59a87b3d5f5c 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/user/Makefile
+++ b/openair-cn/NAS/EURECOM-NAS/tst/user/Makefile
@@ -17,6 +17,7 @@ all: $(TARGET)
 
 $(TARGET): $(OBJS)
 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+	@$(CP) $(TARGET) $(BINDIR)
 
 clean:
 	$(RM) $(OBJS) *.bak *~