diff --git a/openair3/NAS/UE/API/USER/at_command.c b/openair3/NAS/UE/API/USER/at_command.c
index 89793a55ae3bdb38ba1b61f5390678628ec053e8..8f40ba93c434f7f06e7765ff09774318db28f13e 100644
--- a/openair3/NAS/UE/API/USER/at_command.c
+++ b/openair3/NAS/UE/API/USER/at_command.c
@@ -54,6 +54,7 @@ Description Defines the ATtention (AT) command set supported by the NAS
 /****************  E X T E R N A L    D E F I N I T I O N S  ****************/
 /****************************************************************************/
 
+// FIXME Put this in .h
 extern int at_response_format_v1;
 extern int at_error_code_suppression_q1;
 extern at_error_format_t at_error_format;
@@ -278,6 +279,7 @@ int at_command_decode(const char* buffer, int length, at_command_t* at_command)
   char* buf = strdup(buffer+2);
   char* cmd = strtok(buf, ";");
 
+  // FIXME check overflow
   for (i=0; cmd && (rc != RETURNerror); i++) {
     rc = ParseString(cmd, &at_command[i]);
     cmd = strtok(NULL, ";");
diff --git a/openair3/NAS/UE/API/USER/at_error.c b/openair3/NAS/UE/API/USER/at_error.c
index 443c6a3300c5b2f2e336906f1b43fc37e739c954..7548fb513effb3d502cac4ce593b1f55e7be55f1 100644
--- a/openair3/NAS/UE/API/USER/at_error.c
+++ b/openair3/NAS/UE/API/USER/at_error.c
@@ -49,6 +49,7 @@ Description Defines error codes returned when execution of AT command
 /****************  E X T E R N A L    D E F I N I T I O N S  ****************/
 /****************************************************************************/
 
+// FIXME put this in .h
 extern int at_response_format_v1;
 
 /*
diff --git a/openair3/NAS/UE/EMM/SAP/EmmDeregistered.c b/openair3/NAS/UE/EMM/SAP/EmmDeregistered.c
index 21f07ba38569eef08f49fc8e17f5d6d3691d4e76..a2a93c4d780a68e36c6b97ee3a7c3eb0ee64d8b5 100644
--- a/openair3/NAS/UE/EMM/SAP/EmmDeregistered.c
+++ b/openair3/NAS/UE/EMM/SAP/EmmDeregistered.c
@@ -97,7 +97,6 @@ int EmmDeregistered(nas_user_t *user, const emm_reg_t *evt)
 
 
   /* Delete the authentication data RAND and RES */
-  // FIXME REVIEW
   rc = emm_proc_authentication_delete(user);
 
   if (rc != RETURNok) {
diff --git a/openair3/NAS/UE/EMM/emm_proc.h b/openair3/NAS/UE/EMM/emm_proc.h
index 3abf554ef7961e6e021b8913fa2b32c64aa042a0..a6a32448a40d4f1bd053f4d1d65b89451e62c4c2 100644
--- a/openair3/NAS/UE/EMM/emm_proc.h
+++ b/openair3/NAS/UE/EMM/emm_proc.h
@@ -107,7 +107,6 @@ int emm_proc_attach_release(void *args);
 int emm_proc_attach_restart(nas_user_t *user);
 
 int emm_proc_attach_set_emergency(emm_data_t *emm_data);
-// FIXME check prototype
 int emm_proc_attach_set_detach(void *user);
 
 
diff --git a/openair3/NAS/UE/ESM/esmData.h b/openair3/NAS/UE/ESM/esmData.h
index ef7f523435664132d2e49358d45f60f44b0ac557..02bc0dd93073e80601dae5dd028c86b9017efab6 100644
--- a/openair3/NAS/UE/ESM/esmData.h
+++ b/openair3/NAS/UE/ESM/esmData.h
@@ -204,6 +204,7 @@ typedef esm_data_context_t esm_data_t;
 /******************  E X P O R T E D    F U N C T I O N S  ******************/
 /****************************************************************************/
 
+// FIXME prototype and buffer allocation
 extern char ip_addr_str[100];
 
 extern char *esm_data_get_ipv4_addr(const OctetString *ip_addr);
diff --git a/openair3/NAS/UE/ESM/esm_ip.c b/openair3/NAS/UE/ESM/esm_ip.c
index 23d8ecce97708a1078ffaa815ce3440aec7276d9..2638221a8f9cb1a86826bb8201a3e0b40a967c42 100644
--- a/openair3/NAS/UE/ESM/esm_ip.c
+++ b/openair3/NAS/UE/ESM/esm_ip.c
@@ -25,6 +25,7 @@
 // FIXME don't work for reentrant calls
 char ip_addr_str[100];
 
+// FIXME can't be extern and inline at same time !
 inline char *esm_data_get_ipv4_addr(const OctetString *ip_addr)
 {
   if (ip_addr->length > 0) {
diff --git a/openair3/NAS/UE/nas_ue_task.c b/openair3/NAS/UE/nas_ue_task.c
index bca60babc7b579a5b797c100d6b451f964d66024..9b1531b549e5c9676d675f5cc56c7fd14bb46a8c 100644
--- a/openair3/NAS/UE/nas_ue_task.c
+++ b/openair3/NAS/UE/nas_ue_task.c
@@ -33,8 +33,10 @@
 
 #include "nas_user.h"
 
+// FIXME make command line option for NAS_UE_AUTOSTART
 # define NAS_UE_AUTOSTART 1
 
+// FIXME review these externs
 extern unsigned char NB_eNB_INST;
 extern unsigned char NB_UE_INST;