diff --git a/lib/include/srslte/phy/phch/pucch.h b/lib/include/srslte/phy/phch/pucch.h
index a4e5fe681..1702686e2 100644
--- a/lib/include/srslte/phy/phch/pucch.h
+++ b/lib/include/srslte/phy/phch/pucch.h
@@ -127,7 +127,7 @@ SRSLTE_API int srslte_pucch_format2ab_mod_bits(srslte_pucch_format_t format, uin
 
 SRSLTE_API uint32_t srslte_pucch_m(const srslte_pucch_cfg_t* cfg, srslte_cp_t cp);
 
-SRSLTE_API uint32_t srslte_pucch_n_prb(srslte_cell_t* cell, srslte_pucch_cfg_t* cfg, uint32_t ns);
+SRSLTE_API uint32_t srslte_pucch_n_prb(const srslte_cell_t* cell, const srslte_pucch_cfg_t* cfg, uint32_t ns);
 
 SRSLTE_API int srslte_pucch_n_cs_cell(srslte_cell_t cell,
                                       uint32_t      n_cs_cell[SRSLTE_NSLOTS_X_FRAME][SRSLTE_CP_NORM_NSYMB]);
diff --git a/lib/src/phy/phch/pucch.c b/lib/src/phy/phch/pucch.c
index 78e48677a..6cda1d597 100644
--- a/lib/src/phy/phch/pucch.c
+++ b/lib/src/phy/phch/pucch.c
@@ -953,7 +953,7 @@ bool srslte_pucch_cfg_isvalid(srslte_pucch_cfg_t* cfg, uint32_t nof_prb)
   }
 }
 
-uint32_t srslte_pucch_n_prb(srslte_cell_t* cell, srslte_pucch_cfg_t* cfg, uint32_t ns)
+uint32_t srslte_pucch_n_prb(const srslte_cell_t* cell, const srslte_pucch_cfg_t* cfg, uint32_t ns)
 {
   uint32_t m = srslte_pucch_m(cfg, cell->cp);
   // Determine n_prb
diff --git a/srsenb/src/stack/mac/schedulers/sched_time_rr.cc b/srsenb/src/stack/mac/schedulers/sched_time_rr.cc
index 08d9cebe5..80d758d12 100644
--- a/srsenb/src/stack/mac/schedulers/sched_time_rr.cc
+++ b/srsenb/src/stack/mac/schedulers/sched_time_rr.cc
@@ -52,7 +52,7 @@ void sched_time_rr::sched_dl_retxs(sched_ue_list& ue_db, sf_sched* tti_sched, si
     }
     alloc_outcome_t code = try_dl_retx_alloc(*tti_sched, user, *h);
     if (code == alloc_outcome_t::DCI_COLLISION) {
-      logger.info("SCHED: Couldn't find space in PDCCH for DL retx for rnti=0x%x", user.get_rnti());
+      logger.info("SCHED: Couldn't find space in PDCCH/PUCCH for DL retx for rnti=0x%x", user.get_rnti());
     }
   }
 }
@@ -75,7 +75,7 @@ void sched_time_rr::sched_dl_newtxs(sched_ue_list& ue_db, sf_sched* tti_sched, s
       continue;
     }
     if (try_dl_newtx_alloc_greedy(*tti_sched, user, *h) == alloc_outcome_t::DCI_COLLISION) {
-      logger.info("SCHED: Couldn't find space in PDCCH for DL tx for rnti=0x%x", user.get_rnti());
+      logger.info("SCHED: Couldn't find space in PDCCH/PUCCH for DL tx for rnti=0x%x", user.get_rnti());
     }
   }
 }
diff --git a/srsenb/test/mac/sched_sim_ue.cc b/srsenb/test/mac/sched_sim_ue.cc
index 2cc46e0c3..e6bfc8d62 100644
--- a/srsenb/test/mac/sched_sim_ue.cc
+++ b/srsenb/test/mac/sched_sim_ue.cc
@@ -351,7 +351,7 @@ int sched_sim_base::apply_tti_events(sim_ue_ctxt_t& ue_ctxt, const ue_tti_events
     }
 
     if (cc_feedback.ul_pid >= 0) {
-      auto& h = ue_ctxt.cc_list[cc_feedback.ue_cc_idx].ul_harqs[cc_feedback.dl_pid];
+      auto& h = ue_ctxt.cc_list[cc_feedback.ue_cc_idx].ul_harqs[cc_feedback.ul_pid];
 
       if (cc_feedback.ul_ack) {
         logger.info("UL ACK rnti=0x%x tti_ul_tx=%u pid=%d",
diff --git a/srsenb/test/mac/sched_test_utils.h b/srsenb/test/mac/sched_test_utils.h
index 404fb4714..fc561f37a 100644
--- a/srsenb/test/mac/sched_test_utils.h
+++ b/srsenb/test/mac/sched_test_utils.h
@@ -47,8 +47,12 @@ inline srsenb::sched_interface::cell_cfg_t generate_default_cell_cfg(uint32_t no
   cell_cfg.prach_freq_offset = (cell_cfg_phy.nof_prb == 6) ? 0 : 2;
   cell_cfg.prach_rar_window  = 3;
   cell_cfg.maxharq_msg3tx    = 3;
-  cell_cfg.initial_dl_cqi    = 5;
+  cell_cfg.initial_dl_cqi    = 6;
   cell_cfg.target_ul_sinr    = -1;
+  cell_cfg.nrb_cqi           = 2;
+  cell_cfg.n1pucch_an        = 12;
+  cell_cfg.delta_pucch_shift = 2;
+  cell_cfg.ncs_an            = 0;
 
   return cell_cfg;
 }