diff --git a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
index 8996807a8f..b716c5dfe1 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
@@ -1385,6 +1385,7 @@ schedule_ulsch_rnti(module_id_t module_idP,
     if (!ue_ul_slice_membership(module_idP, UE_id, slice_idx)) {
       continue;
     }
+    if (UE_list->UE_template[UE_PCCID(module_idP, UE_id)][UE_id].rach_resource_type > 0)  continue;
 
     // don't schedule if Msg5 is not received yet
     if (UE_list->UE_template[UE_PCCID(module_idP, UE_id)][UE_id].configured == FALSE) {
@@ -1961,9 +1962,7 @@ void schedule_ulsch_rnti_emtc(module_id_t   module_idP,
     UE_template = &(UE_list->UE_template[UE_PCCID(module_idP, UE_id)][UE_id]);
 
     /* LTE-M device */
-    if (UE_template->rach_resource_type == 0) {
-      continue;
-    }
+    if (UE_template->rach_resource_type == 0) continue;
 
     /* Don't schedule if Msg4 is not received yet */
     if (UE_template->configured == FALSE) {
@@ -1994,6 +1993,8 @@ void schedule_ulsch_rnti_emtc(module_id_t   module_idP,
       N_RB_UL = to_prb(cc[CC_id].ul_Bandwidth);
 
       UE_template   = &(UE_list->UE_template[CC_id][UE_id]);
+      UE_sched_ctrl = &UE_list->UE_sched_ctrl[UE_id];
+
       harq_pid      = 0;
       round_UL      = UE_sched_ctrl->round_UL[CC_id][harq_pid];
 
@@ -2002,7 +2003,7 @@ void schedule_ulsch_rnti_emtc(module_id_t   module_idP,
                   UE_id,
                   rnti);
 
-      LOG_D(MAC,"[eNB %d] frame %d subframe %d,Checking PUSCH %d for BL/CE UE %d/%x CC %d : aggregation level %d, N_RB_UL %d\n",
+      LOG_I(MAC,"[eNB %d] frame %d subframe %d,Checking PUSCH %d for BL/CE UE %d/%x CC %d : aggregation level %d, N_RB_UL %d\n",
             module_idP,
             frameP,
             subframeP,
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index 97c3ecc10d..5247674b86 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -6619,17 +6619,18 @@ void rrc_eNB_generate_RRCConnectionSetup(const protocol_ctxt_t *const ctxt_pP,
 			    rrc_eNB_get_next_transaction_identifier(ctxt_pP->module_id),
 			    SRB_configList,
 			    &ue_context_pP->ue_context.physicalConfigDedicated);
-    LOG_DUMPMSG(RRC,DEBUG_RRC,
-		(char *)(RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Tx_buffer.Payload),
-		RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Tx_buffer.payload_size,
-		"[MSG] RRC Connection Setup\n");
+  }
+  LOG_DUMPMSG(RRC,DEBUG_RRC,
+	(char *)(RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Tx_buffer.Payload),
+	RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Tx_buffer.payload_size,
+	"[MSG] RRC Connection Setup\n");
     
     // configure SRB1/SRB2, PhysicalConfigDedicated, LTE_MAC_MainConfig for UE
     
-    if (*SRB_configList != NULL) {
-      for (cnt = 0; cnt < (*SRB_configList)->list.count; cnt++) {
-	if ((*SRB_configList)->list.array[cnt]->srb_Identity == 1) {
-	  SRB1_config = (*SRB_configList)->list.array[cnt];
+  if (*SRB_configList != NULL) {
+    for (cnt = 0; cnt < (*SRB_configList)->list.count; cnt++) {
+      if ((*SRB_configList)->list.array[cnt]->srb_Identity == 1) {
+          SRB1_config = (*SRB_configList)->list.array[cnt];
 	  
 	  if (SRB1_config->logicalChannelConfig) {
 	    if (SRB1_config->logicalChannelConfig->present ==
@@ -6683,7 +6684,6 @@ void rrc_eNB_generate_RRCConnectionSetup(const protocol_ctxt_t *const ctxt_pP,
 	  break;
 	}
       }
-    }
     
     MSC_LOG_TX_MESSAGE(
 		       MSC_RRC_ENB,