diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c
index c610107da6..945dc9bc18 100644
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
@@ -108,8 +108,8 @@ extern openair0_config_t openair0_cfg[MAX_CARDS];
 
 extern int transmission_mode;
 
-uint16_t sl_ahead=4;
-uint16_t sf_ahead=4;
+uint16_t sl_ahead=6;
+uint16_t sf_ahead=6;
 //pthread_t                       main_gNB_thread;
 
 time_stats_t softmodem_stats_mt; // main thread
diff --git a/executables/nr-ue.c b/executables/nr-ue.c
index d374fc1d71..40b2e0a975 100644
--- a/executables/nr-ue.c
+++ b/executables/nr-ue.c
@@ -685,6 +685,7 @@ void *UE_thread(void *arg) {
                                            rxp,
                                            readBlockSize,
                                            UE->frame_parms.nb_antennas_rx),"");
+    /*
     AssertFatal( writeBlockSize ==
                  UE->rfdevice.trx_write_func(&UE->rfdevice,
                      timestamp+
@@ -695,6 +696,7 @@ void *UE_thread(void *arg) {
                      writeBlockSize,
                      UE->frame_parms.nb_antennas_tx,
                      1),"");
+    */
 
     if( slot_nr==(nb_slot_frame-1)) {
       // read in first symbol of next frame and adjust for timing drift
diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c
index 4c30ef9140..c1a58c723d 100644
--- a/openair2/GNB_APP/gnb_config.c
+++ b/openair2/GNB_APP/gnb_config.c
@@ -808,10 +808,10 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
             }
         
             NRRRC_CONFIGURATION_REQ (msg_p).N_RB_DL[j]= N_RB_DL;
-            if(N_RB_DL == 217)      sf_ahead = 2;
-            else if(N_RB_DL == 106) sf_ahead = 4;
-            else                    AssertFatal (0,"Failed to parse gNB configuration file %s, gnb %d unknown value \"%d\" for N_RB_DL choice: 106, 217 !\n",
-                                                 RC.config_file_name, i, N_RB_DL);
+            //if(N_RB_DL == 217)      sf_ahead = 2;
+            //else if(N_RB_DL == 106) sf_ahead = 4;
+            if ((N_RB_DL != 217) && (N_RB_DL != 106))
+	      AssertFatal (0,"Failed to parse gNB configuration file %s, gnb %d unknown value \"%d\" for N_RB_DL choice: 106, 217 !\n", RC.config_file_name, i, N_RB_DL);
             
             /*
             if ((N_RB_DL!=6) && (N_RB_DL!=15) && (N_RB_DL!=25) && (N_RB_DL!=50) && (N_RB_DL!=75) && (N_RB_DL!=100)) {