diff --git a/openair1/SCHED_NR/nr_ru_procedures.c b/openair1/SCHED_NR/nr_ru_procedures.c
index 103d612b302d3581cd515b67c5f6ec9a50bb14f2..7fee26c79ccd00bb35ccea9feceb964a57ec7881 100644
--- a/openair1/SCHED_NR/nr_ru_procedures.c
+++ b/openair1/SCHED_NR/nr_ru_procedures.c
@@ -83,7 +83,7 @@ void nr_feptx0(RU_t *ru,int slot) {
 					                      12,
 					                      fp->nb_prefix_samples,
 					                      CYCLIC_PREFIX);
-    else                     normal_prefix_mod(&ru->common.txdataF_BF[aa][slot*slot_sizeF],
+    else                     nr_normal_prefix_mod(&ru->common.txdataF_BF[aa][slot*slot_sizeF],
 					                           (int*)&ru->common.txdata[aa][slot_offset],
 					                           14,
 					                           fp);
@@ -230,12 +230,12 @@ void nr_feptx_ofdm(RU_t *ru) {
                      fp->nb_prefix_samples,
                      CYCLIC_PREFIX);
       } else {
-        normal_prefix_mod(&ru->common.txdataF_BF[aa][slot_offset_F],
+        nr_normal_prefix_mod(&ru->common.txdataF_BF[aa][slot_offset_F],
                           dummy_tx_b,
                           14,
                           fp);
 	// if S-subframe generate first slot only
-	if (subframe_select(fp,subframe) == SF_DL) 
+	if (nr_subframe_select(fp,subframe) == SF_DL) 
 	  nr_normal_prefix_mod(&ru->common.txdataF_BF[aa][slot_offset_F+slot_sizeF],
 			    dummy_tx_b+(fp->samples_per_subframe / fp->slots_per_subframe),
 			    14,
diff --git a/targets/RT/USER/nr-ru.c b/targets/RT/USER/nr-ru.c
index 0686cc72e857c1f0ad2684ed050b17c247e2c59e..70d0b7e031e93d08ac685067bb7a2d7a8e786327 100644
--- a/targets/RT/USER/nr-ru.c
+++ b/targets/RT/USER/nr-ru.c
@@ -1241,7 +1241,7 @@ void fill_rf_config(RU_t *ru, char *rf_config_file) {
   
   for (i=0; i<ru->nb_tx; i++) {
     
-    cfg->tx_freq[i] = (double)fp->dl_CarrierFreq;
+    cfg->tx_freq[i] = (double)gNB_config->nfapi_config.earfcn.value; //fp->dl_CarrierFreq;
     cfg->rx_freq[i] = (double)fp->ul_CarrierFreq;
 
     cfg->tx_gain[i] = ru->att_tx;