diff --git a/openair1/SCHED_UE/phy_procedures_lte_ue.c b/openair1/SCHED_UE/phy_procedures_lte_ue.c
index 8ceda675e8..807c79e6e0 100644
--- a/openair1/SCHED_UE/phy_procedures_lte_ue.c
+++ b/openair1/SCHED_UE/phy_procedures_lte_ue.c
@@ -73,7 +73,6 @@
 
 extern double cpuf;
 
-
 void Msg1_transmitted(module_id_t module_idP,uint8_t CC_id,frame_t frameP, uint8_t eNB_id);
 void Msg3_transmitted(module_id_t module_idP,uint8_t CC_id,frame_t frameP, uint8_t eNB_id);
 
@@ -2628,6 +2627,8 @@ int ue_pdcch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint
         // we received a CRNTI, so we're in PUSCH
         if (ue->UE_mode[eNB_id] != PUSCH) {
           if (LOG_DEBUGFLAG(DEBUG_UE_PHYPROC)) {
+            LOG_D(PHY,"[UE  %d] Frame %d, subframe %d: Received DCI with CRNTI %x => Mode PUSCH\n",ue->Mod_id,frame_rx,subframe_rx,ue->pdcch_vars[subframe_rx&1][eNB_id]->crnti);
+          }
 
           //dump_dci(&ue->frame_parms, &dci_alloc_rx[i]);
           ue->UE_mode[eNB_id] = PUSCH;
diff --git a/openair2/F1AP/f1ap_du_rrc_message_transfer.c b/openair2/F1AP/f1ap_du_rrc_message_transfer.c
index be04a60cbf..a5aa5da569 100644
--- a/openair2/F1AP/f1ap_du_rrc_message_transfer.c
+++ b/openair2/F1AP/f1ap_du_rrc_message_transfer.c
@@ -66,7 +66,6 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t       instance,
                                       uint32_t         assoc_id,
                                       uint32_t         stream,
                                       F1AP_F1AP_PDU_t *pdu) {
-#ifndef UETARGET 
   LOG_D(F1AP, "DU_handle_DL_RRC_MESSAGE_TRANSFER \n");
   
   F1AP_DLRRCMessageTransfer_t    *container;
@@ -578,7 +577,6 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t       instance,
       return ret; 
     } // if pdcp_pdu_p
   
-#endif
   return 0;
   
 }
@@ -760,7 +758,6 @@ int DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(module_id_t     module_idP,
                                             rnti_t          rntiP,
                                             uint8_t        *sduP,
                                             sdu_size_t      sdu_lenP) {
-#ifndef UETARGET
   F1AP_F1AP_PDU_t                       pdu;
   F1AP_InitialULRRCMessageTransfer_t    *out;
   F1AP_InitialULRRCMessageTransferIEs_t *ie;
@@ -853,7 +850,6 @@ int DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(module_id_t     module_idP,
   ue_context_p->ue_context.Srb0.Active        = 1;
   RB_INSERT(rrc_ue_tree_s, &RC.rrc[module_idP]->rrc_ue_head, ue_context_p);
   du_f1ap_itti_send_sctp_data_req(module_idP, f1ap_du_data->assoc_id, buffer, len,  f1ap_du_data->default_sctp_stream_id);
-#endif
 
   return 0;
 }
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
index 435793adfa..d0fdc0197f 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
@@ -60,7 +60,9 @@
 #  include "gtpv1u.h"
 
 #include "ENB_APP/enb_config.h"
+#ifndef UETARGET
 #include "LAYER2/PROTO_AGENT/proto_agent.h"
+#endif
 
 extern int otg_enabled;
 extern uint8_t nfapi_mode;
@@ -188,6 +190,7 @@ boolean_t pdcp_data_req(
                                   sdu_buffer_sizeP);
         LOG_UI(PDCP, "Before rlc_data_req 1, srb_flagP: %d, rb_idP: %d \n", srb_flagP, rb_idP);
       }
+#ifndef UETARGET
       if (RC.rrc[ctxt_pP->module_id]->node_type == ngran_eNB_CU
           || RC.rrc[ctxt_pP->module_id]->node_type == ngran_ng_eNB_CU
           || RC.rrc[ctxt_pP->module_id]->node_type == ngran_gNB_CU) {
@@ -197,7 +200,9 @@ boolean_t pdcp_data_req(
         /* assume good status */
         rlc_status = RLC_OP_STATUS_OK;
 
-      } else {
+      } else
+#endif
+      {
         rlc_status = rlc_data_req(ctxt_pP, srb_flagP, MBMS_FLAG_YES, rb_idP, muiP,
                                   confirmP, sdu_buffer_sizeP, pdcp_pdu_p
                                   ,NULL, NULL
@@ -368,6 +373,7 @@ boolean_t pdcp_data_req(
        LOG_D(PDCP, "pdcp data req on drb %d, size %d, rnti %x, node_type %d \n", 
             rb_idP, pdcp_pdu_size, ctxt_pP->rnti, RC.rrc[ctxt_pP->module_id]->node_type);
 
+#ifndef UETARGET
        if (RC.rrc[ctxt_pP->module_id]->node_type == ngran_eNB_CU
            || RC.rrc[ctxt_pP->module_id]->node_type == ngran_ng_eNB_CU
            || RC.rrc[ctxt_pP->module_id]->node_type == ngran_gNB_CU) {
@@ -384,9 +390,9 @@ boolean_t pdcp_data_req(
           || RC.rrc[ctxt_pP->module_id]->node_type == ngran_gNB_DU){
         LOG_E(PDCP, "Can't be DU, bad node type %d \n", RC.rrc[ctxt_pP->module_id]->node_type);
         ret=FALSE;
-      } 
-      else {
-
+      } else
+#endif
+      {
         rlc_status = rlc_data_req(ctxt_pP, srb_flagP, MBMS_FLAG_NO, rb_idP, muiP,
                                   confirmP, pdcp_pdu_size, pdcp_pdu_p, sourceL2Id,
                                   destinationL2Id
@@ -418,8 +424,6 @@ boolean_t pdcp_data_req(
               break;
           } // switch case 
       } /* end if node_type is CU */
-    
-      rlc_status = ack_result;
     }
     else // SRB
     {
diff --git a/openair2/LAYER2/RLC/rlc.c b/openair2/LAYER2/RLC/rlc.c
index b57522658d..7d431fcf20 100644
--- a/openair2/LAYER2/RLC/rlc.c
+++ b/openair2/LAYER2/RLC/rlc.c
@@ -625,6 +625,7 @@ void rlc_data_ind     (
            F1AP_UL_RRC_MESSAGE(msg).rrc_container_length = sdu_sizeP;
            itti_send_msg_to_task(TASK_DU_F1, ENB_MODULE_ID_TO_INSTANCE(ctxt_pP->module_id), msg);
          }
+#ifndef UETARGET
          else
            proto_agent_send_pdcp_data_ind (
              ctxt_pP,
@@ -633,6 +634,7 @@ void rlc_data_ind     (
              rb_idP,
              sdu_sizeP,
              sdu_pP);
+#endif
      
        break;