diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
index ae361591d2..8ee1e90077 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
@@ -497,8 +497,6 @@ uint8_t nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
 
   NR_UE_MAC_INST_t *mac = get_mac_inst(mod_id);
   RA_config_t *ra = &mac->ra;
-  uint8_t lcid = UL_SCH_LCID_CCCH;
-  uint8_t sh_size = sizeof(NR_MAC_SUBHEADER_SHORT);
   int8_t size_sdu = 0;
 
   NR_RACH_ConfigCommon_t *setup;
@@ -534,7 +532,9 @@ uint8_t nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
 
       LOG_D(NR_MAC, "In %s: RA not active. Checking for data to transmit from upper layers...\n", __FUNCTION__);
 
-      uint8_t TBS_max = 8 + 2 * sh_size;
+      const uint8_t lcid = UL_SCH_LCID_CCCH;
+      const uint8_t sh_size = sizeof(NR_MAC_SUBHEADER_SHORT);
+      const uint8_t TBS_max = 8 + 2 * sh_size;
       uint8_t *pdu = (uint8_t*) mac->CCCH_pdu.payload;
       NR_MAC_SUBHEADER_SHORT *header = (NR_MAC_SUBHEADER_SHORT *) pdu;
       pdu += sh_size;
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
index 4a174057ef..4719e8f277 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
@@ -1990,7 +1990,7 @@ uint8_t nr_ue_get_sdu(module_id_t module_idP,
   uint16_t num_sdus = 0;
   uint16_t sdu_length_total = 0;
   NR_UE_MAC_INST_t *mac = get_mac_inst(module_idP);
-  uint8_t sh_size = sizeof(NR_MAC_SUBHEADER_LONG);
+  const uint8_t sh_size = sizeof(NR_MAC_SUBHEADER_LONG);
 
   // Pointer used to build the MAC PDU by placing the RLC SDUs in the ULSCH buffer
   uint8_t *pdu = ulsch_buffer;