diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c
index ba00de2a00..40cfc4d611 100644
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
@@ -321,22 +321,12 @@ static void *gNB_L1_thread( void *param ) {
   //PHY_VARS_gNB *gNB = RC.gNB[0][proc->CC_id];
   char thread_name[100];
 
-  // This tells ru_thread that L1_thread is not ready
-  pthread_mutex_lock(&L1_proc->mutex);
-  L1_proc->instance_cnt = -2;
-  pthread_mutex_unlock(&L1_proc->mutex);
-
   // set default return value
   gNB_thread_rxtx_status = 0;
 
   sprintf(thread_name,"gNB_L1_thread");
 
 
-  // This tells ru_thread that L1_thread is ready
-  pthread_mutex_lock(&L1_proc->mutex);
-  L1_proc->instance_cnt++;
-  pthread_mutex_unlock(&L1_proc->mutex);
-
   while (!oai_exit) {
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_gNB_PROC_RXTX0, 0 );
     if (wait_on_condition(&L1_proc->mutex,&L1_proc->cond,&L1_proc->instance_cnt,thread_name)<0) break;
diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c
index 56c53725a4..a5a9214026 100644
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -437,9 +437,9 @@ void init_nr_transport(PHY_VARS_gNB *gNB) {
   nfapi_nr_config_request_t *cfg = &gNB->gNB_config;
   LOG_I(PHY, "Initialise nr transport\n");
 
-  for (i=0; i<NUMBER_OF_UE_MAX; i++) {
+  for (i=0; i<NUMBER_OF_NR_DLSCH_MAX; i++) {
 
-    LOG_I(PHY,"Allocating Transport Channel Buffers for DLSCH, UE %d\n",i);
+    LOG_I(PHY,"Allocating Transport Channel Buffers for DLSCH %d/%d\n",i,NUMBER_OF_NR_DLSCH_MAX);
 
     for (j=0; j<2; j++) {
       gNB->dlsch[i][j] = new_gNB_dlsch(1,16,NSOFT,0,fp,cfg);