diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 8c568f0da3..ea165edeaf 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -2145,6 +2145,11 @@ set (GTPV1U_SRC
 add_library(GTPV1U ${GTPV1U_SRC})
 add_dependencies(GTPV1U rrc_flag)
 
+add_library (GTPV1U_OCP
+${OPENAIR3_DIR}/ocp-gtp/gtp_itf.cpp
+)
+include_directories(${OPENAIR3_DIR}/ocp-gtp)
+
 #NR case
 set (NR_GTPV1U_SRC
   ${NR_RRC_DIR}/rrc_gNB_GTPV1U.c
diff --git a/executables/ocp-gnb.c b/executables/ocp-gnb.c
index bcd337b836..0b93e1fbef 100644
--- a/executables/ocp-gnb.c
+++ b/executables/ocp-gnb.c
@@ -258,6 +258,12 @@ void init_gNB_proc(int inst) {
   proc->RU_mask_tx               = (1<<gNB->num_RU)-1;
   proc->RU_mask_prach            =0;
   pthread_mutex_init( &gNB->UL_INFO_mutex, NULL);
+  gNB->threadPool = (tpool_t*)malloc(sizeof(tpool_t));
+  gNB->respDecode = (notifiedFIFO_t*) malloc(sizeof(notifiedFIFO_t));
+  char ul_pool[] = "-1,-1";
+  initTpool(ul_pool, gNB->threadPool, false);
+  initNotifiedFIFO(gNB->respDecode);
+
 }
 
 /// eNB kept in function name for nffapi calls, TO FIX
diff --git a/openair1/PHY/defs_L1_NB_IoT.h b/openair1/PHY/defs_L1_NB_IoT.h
index 1f8c0b8eee..cc3ec94a95 100644
--- a/openair1/PHY/defs_L1_NB_IoT.h
+++ b/openair1/PHY/defs_L1_NB_IoT.h
@@ -32,7 +32,9 @@
 #ifndef __PHY_DEFS_NB_IOT__H__
 #define __PHY_DEFS_NB_IOT__H__
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>