diff --git a/lib/mac/mac_sched/uci_cell_decoder.cpp b/lib/mac/mac_sched/uci_cell_decoder.cpp
index eca82a2073..ae931d789e 100644
--- a/lib/mac/mac_sched/uci_cell_decoder.cpp
+++ b/lib/mac/mac_sched/uci_cell_decoder.cpp
@@ -21,7 +21,8 @@ uci_cell_decoder::uci_cell_decoder(const sched_cell_configuration_request_messag
   rnti_table(rnti_table_),
   cell_index(cell_cfg.cell_index),
   rlf_handler(rlf_hdlr_),
-  logger(srslog::fetch_basic_logger("MAC"))
+  logger(srslog::fetch_basic_logger("MAC")),
+  expected_uci_report_grid(MAX_GRID_SIZE)
 {
 }
 
diff --git a/lib/mac/mac_sched/uci_cell_decoder.h b/lib/mac/mac_sched/uci_cell_decoder.h
index b22ea2b024..8ef58aafe2 100644
--- a/lib/mac/mac_sched/uci_cell_decoder.h
+++ b/lib/mac/mac_sched/uci_cell_decoder.h
@@ -55,7 +55,7 @@ class uci_cell_decoder
   rlf_detector&         rlf_handler;
   srslog::basic_logger& logger;
 
-  std::array<static_vector<uci_context, MAX_PUCCH_PDUS_PER_SLOT>, MAX_GRID_SIZE> expected_uci_report_grid;
+  std::vector<static_vector<uci_context, MAX_PUCCH_PDUS_PER_SLOT>> expected_uci_report_grid;
 };
 
 } // namespace srsran
diff --git a/lib/scheduler/logging/scheduler_metric_handler.cpp b/lib/scheduler/logging/scheduler_metric_handler.cpp
index f30a8ebad1..1a963c8c76 100644
--- a/lib/scheduler/logging/scheduler_metric_handler.cpp
+++ b/lib/scheduler/logging/scheduler_metric_handler.cpp
@@ -410,7 +410,7 @@ cell_metrics_handler* scheduler_metrics_handler::add_cell(const cell_configurati
     return nullptr;
   }
 
-  cells.emplace(cell_cfg.cell_index, report_period, notifier, cell_cfg);
+  cells.emplace(cell_cfg.cell_index, std::make_unique<cell_metrics_handler>(report_period, notifier, cell_cfg));
 
-  return &cells[cell_cfg.cell_index];
+  return cells[cell_cfg.cell_index].get();
 }
diff --git a/lib/scheduler/logging/scheduler_metrics_handler.h b/lib/scheduler/logging/scheduler_metrics_handler.h
index c8175476b3..011af3954e 100644
--- a/lib/scheduler/logging/scheduler_metrics_handler.h
+++ b/lib/scheduler/logging/scheduler_metrics_handler.h
@@ -192,13 +192,13 @@ class scheduler_metrics_handler
 
   cell_metrics_handler* add_cell(const cell_configuration& cell_cfg);
 
-  cell_metrics_handler& at(du_cell_index_t cell_idx) { return cells[cell_idx]; }
+  cell_metrics_handler& at(du_cell_index_t cell_idx) { return *cells[cell_idx]; }
 
 private:
   scheduler_metrics_notifier&     notifier;
   const std::chrono::milliseconds report_period;
 
-  slotted_array<cell_metrics_handler, MAX_NOF_DU_CELLS> cells;
+  slotted_array<std::unique_ptr<cell_metrics_handler>, MAX_NOF_DU_CELLS> cells;
 };
 
 } // namespace srsran
diff --git a/lib/scheduler/scheduler_impl.h b/lib/scheduler/scheduler_impl.h
index 578be45334..90c46c1abc 100644
--- a/lib/scheduler/scheduler_impl.h
+++ b/lib/scheduler/scheduler_impl.h
@@ -12,9 +12,7 @@
 
 #include "cell_scheduler.h"
 #include "config/sched_config_manager.h"
-#include "logging/scheduler_event_logger.h"
 #include "logging/scheduler_metrics_handler.h"
-#include "logging/scheduler_result_logger.h"
 #include "ue_scheduling/ue_scheduler.h"
 #include "srsran/scheduler/config/scheduler_expert_config.h"
 #include "srsran/scheduler/mac_scheduler.h"