diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
index 4c01e77cb1..8dd0988be4 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
@@ -80,12 +80,19 @@ void init_RA(module_id_t mod_id,
       LOG_I(MAC, "Initialization of 4-step contention-free random access procedure\n");
       prach_resources->RA_TYPE = RA_4STEP;
       ra->cfra = 1;
+    } else if (rach_ConfigDedicated->ext1){
+      if (rach_ConfigDedicated->ext1->cfra_TwoStep_r16){
+        LOG_I(MAC, "In %s: setting RA type to 2-step...\n", __FUNCTION__);
+        prach_resources->RA_TYPE = RA_2STEP;
+        ra->cfra = 1;
+      } else {
+        LOG_E(MAC, "In %s: config not handled\n", __FUNCTION__);
+      }
+    } else {
+      LOG_E(MAC, "In %s: config not handled\n", __FUNCTION__);
     }
-  } else if (rach_ConfigDedicated->ext1){
-    if (rach_ConfigDedicated->ext1->cfra_TwoStep_r16){
-      LOG_I(MAC, "In %s: setting RA type to 2-step...\n", __FUNCTION__);
-      prach_resources->RA_TYPE = RA_2STEP;
-    }
+  } else {
+    LOG_E(MAC, "In %s: config not handled\n", __FUNCTION__);
   }
 
   if (prach_resources->RA_TYPE == RA_2STEP){
diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c
index 0962bb6a2d..538175cc22 100644
--- a/targets/RT/USER/lte-ue.c
+++ b/targets/RT/USER/lte-ue.c
@@ -787,10 +787,10 @@ static void *UE_thread_rxn_txnp4(void *arg)
   if ( (proc->sub_frame_start+1)%RX_NB_TH == 0 && threads.one != -1 )
     CPU_SET(threads.one, &cpuset);
 
-  if ( (proc->sub_frame_start+1)%RX_NB_TH == 1 && threads.two != -1 )
+  if ( RX_NB_TH > 1 && (proc->sub_frame_start+1)%RX_NB_TH == 1 && threads.two != -1 )
     CPU_SET(threads.two, &cpuset);
 
-  if ( (proc->sub_frame_start+1)%RX_NB_TH == 2 && threads.three != -1 )
+  if ( RX_NB_TH > 2 && (proc->sub_frame_start+1)%RX_NB_TH == 2 && threads.three != -1 )
     CPU_SET(threads.three, &cpuset);
 
   //CPU_SET(threads.three, &cpuset);