diff --git a/openair3/NGAP/ngap_gNB.c b/openair3/NGAP/ngap_gNB.c
index 31e370d4a17848a4dd4b35d0c1b4a648c303c1ee..7345149806b1b8f161818ae51c843b933a8f7945 100644
--- a/openair3/NGAP/ngap_gNB.c
+++ b/openair3/NGAP/ngap_gNB.c
@@ -489,6 +489,7 @@ static int ngap_gNB_generate_ng_setup_request(
     ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
   }
 
+#if 0
   /* mandatory */
   ie = (NGAP_NGSetupRequestIEs_t *)calloc(1, sizeof(NGAP_NGSetupRequestIEs_t));
   ie->id = NGAP_ProtocolIE_ID_id_SupportedTAList;
@@ -529,6 +530,7 @@ static int ngap_gNB_generate_ng_setup_request(
   }
   ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
   
+#endif
   /* mandatory */
   ie = (NGAP_NGSetupRequestIEs_t *)calloc(1, sizeof(NGAP_NGSetupRequestIEs_t));
   ie->id = NGAP_ProtocolIE_ID_id_DefaultPagingDRX;
diff --git a/openair3/NGAP/ngap_gNB_default_values.h b/openair3/NGAP/ngap_gNB_default_values.h
index 2f53b71254171d46f0354ad5e79db6ea02fa711a..529ab30f7f58bf42c92588d5d1aa08aac9c98cfd 100644
--- a/openair3/NGAP/ngap_gNB_default_values.h
+++ b/openair3/NGAP/ngap_gNB_default_values.h
@@ -29,8 +29,8 @@
 #define GNB_NAME        "Eurecom GNB"
 #define GNB_NAME_FORMAT (GNB_NAME" %u")
 
-#define NGAP_PORT_NUMBER        (36412)
-#define NGAP_SCTP_PPID          (18)
+#define NGAP_PORT_NUMBER        (38412)
+#define NGAP_SCTP_PPID          (60)
 
 #define X2AP_PORT_NUMBER        (36422)
 #define X2AP_SCTP_PPID          (27)
diff --git a/openair3/NGAP/ngap_gNB_defs.h b/openair3/NGAP/ngap_gNB_defs.h
index 31e948c1b57ea2c31092be901663c8bd15059d6a..313df231fafc04f3c5f4d53a7b682ce15b226b3a 100644
--- a/openair3/NGAP/ngap_gNB_defs.h
+++ b/openair3/NGAP/ngap_gNB_defs.h
@@ -24,8 +24,6 @@
 #include "queue.h"
 #include "tree.h"
 
-#include "sctp_gNB_defs.h"
-
 #ifndef NGAP_GNB_DEFS_H_
 #define NGAP_GNB_DEFS_H_
 
@@ -250,7 +248,7 @@ typedef struct ngap_gNB_instance_s {
   enum cell_type_e cell_type;
 
   /* Tracking area code */
-  uint32_t tac;
+  uint16_t tac;
 
   /* gNB NGAP IP address */
   net_ip_address_t gNB_ng_ip;
diff --git a/openair3/SCTP/sctp_gNB_defs.h b/openair3/SCTP/sctp_gNB_defs.h
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000