diff --git a/openair2/LAYER2/MAC/ra_procedures.c b/openair2/LAYER2/MAC/ra_procedures.c
index ddeaab6989..7cace9c568 100644
--- a/openair2/LAYER2/MAC/ra_procedures.c
+++ b/openair2/LAYER2/MAC/ra_procedures.c
@@ -293,7 +293,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
   LOG_E(MAC, "got inside ue_get_rach\n");
 
   // Modification for phy_stub_ue operation
-  if(NFAPI_MODE == NFAPI_UE_STUB_PNF) { // phy_stub_ue mode
+  if(NFAPI_MODE == NFAPI_UE_STUB_PNF || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF) { // phy_stub_ue mode
     UE_mode = UE_mac_inst[module_idP].UE_mode[0];
     LOG_D(MAC, "ue_get_rach , UE_mode: %d", UE_mode);
   } else { // Full stack mode
diff --git a/openair2/PHY_INTERFACE/phy_stub_UE.c b/openair2/PHY_INTERFACE/phy_stub_UE.c
index 2576388b54..845a38c206 100644
--- a/openair2/PHY_INTERFACE/phy_stub_UE.c
+++ b/openair2/PHY_INTERFACE/phy_stub_UE.c
@@ -96,8 +96,8 @@ void *get_queue(queue_t *q) {
 }
 
 extern nfapi_tx_request_pdu_t* tx_request_pdu[1023][10][10];
-//extern int timer_subframe;
-//extern int timer_frame;
+extern int timer_subframe;
+extern int timer_frame;
 
 extern uint16_t sf_ahead;
 
diff --git a/targets/RT/USER/lte-ue.c b/targets/RT/USER/lte-ue.c
index 1d0d82d71c..bd74404376 100644
--- a/targets/RT/USER/lte-ue.c
+++ b/targets/RT/USER/lte-ue.c
@@ -1296,12 +1296,6 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg)
               next_ra_frame++;
               if (next_ra_frame > 500) {
                 // check if we have PRACH opportunity
-                // LOG_I(MAC, "is_prach_subframe: %d UE_mac_inst[ue_MOD_id].SI_Decoded: %u\n",
-                //       is_prach_subframe(&UE->frame_parms, proc->frame_tx, proc->subframe_tx),
-                //       UE_mac_inst[ue_Mod_id].SI_Decoded);
-                LOG_I(MAC, "is_prach_subframe: %d UE_mac_inst %d\n",
-                      is_prach_subframe(&UE->frame_parms, proc->frame_tx, proc->subframe_tx),
-                       UE_mac_inst[ue_Mod_id].SI_Decoded);
                 if (is_prach_subframe(&UE->frame_parms, proc->frame_tx, proc->subframe_tx) && UE_mac_inst[ue_Mod_id].SI_Decoded == 1) {
                   // The one working strangely...
                   //if (is_prach_subframe(&UE->frame_parms,proc->frame_tx, proc->subframe_tx && Mod_id == (module_id_t) init_ra_UE) ) {