diff --git a/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c b/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
index 3aad4980bc..0d7746e196 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
@@ -372,8 +372,8 @@ void nr_processULSegment(void* arg) {
                                rv_index,
                                (ulsch_harq->round==0)?1:0,
                                E,
-       ulsch_harq->F,
-       Kr-ulsch_harq->F-2*(p_decoderParms->Z))==-1) {
+                               ulsch_harq->F,
+                               Kr-ulsch_harq->F-2*(p_decoderParms->Z))==-1) {
 
     stop_meas(&phy_vars_gNB->ulsch_rate_unmatching_stats);
 
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
index fd477ae834..7ba0a9cd94 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
@@ -866,7 +866,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
     UE_info->mac_stats[UE_id].dlsch_rounds[harq->round]++;
 
     LOG_D(NR_MAC,
-          "%4d.%2d RNTI %04x start %3d RBs %3d startSymbol %2d nb_symbol %2d MCS %2d TBS %4d HARQ PID %2d round %d NDI %d\n",
+          "%4d.%2d RNTI %04x start %3d RBs %3d startSymbol %2d nb_symbol %2d MCS %2d nrOfLayers %d TBS %4d HARQ PID %2d round %d NDI %d\n",
           frame,
           slot,
           rnti,
@@ -875,6 +875,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
           ps->startSymbolIndex,
           ps->nrOfSymbols,
           sched_pdsch->mcs,
+          nrOfLayers,
           TBS,
           current_harq_pid,
           harq->round,
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index e597ae936f..96047d541a 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -159,15 +159,15 @@ void set_dl_mcs(NR_sched_pdsch_t *sched_pdsch,
       switch (cqi_table) {
         case 0:
           target_qm = cqi_table1[cqi_idx][0];
-          target_coderate = cqi_table1[cqi_idx][0];
+          target_coderate = cqi_table1[cqi_idx][1];
           break;
         case 1:
           target_qm = cqi_table2[cqi_idx][0];
-          target_coderate = cqi_table2[cqi_idx][0];
+          target_coderate = cqi_table2[cqi_idx][1];
           break;
         case 2:
           target_qm = cqi_table3[cqi_idx][0];
-          target_coderate = cqi_table3[cqi_idx][0];
+          target_coderate = cqi_table3[cqi_idx][1];
           break;
         default:
           AssertFatal(1==0,"Invalid cqi table index %d\n",cqi_table);