diff --git a/lib/include/srslte/radio/radio.h b/lib/include/srslte/radio/radio.h
index ada13b275..6621b3d9a 100644
--- a/lib/include/srslte/radio/radio.h
+++ b/lib/include/srslte/radio/radio.h
@@ -113,6 +113,8 @@ public:
     }
     return *this;
   }
+
+  rf_buffer_t(const rf_buffer_t& other) = delete;
   cf_t* get(const uint32_t& channel_idx) const override { return sample_buffer.at(channel_idx); }
   void  set(const uint32_t& channel_idx, cf_t* ptr) override { sample_buffer.at(channel_idx) = ptr; }
   cf_t* get(const uint32_t& logical_ch, const uint32_t& port_idx, const uint32_t& nof_antennas) const override
diff --git a/srsenb/src/stack/rrc/rrc.cc b/srsenb/src/stack/rrc/rrc.cc
index d97c5a60e..f7456864e 100644
--- a/srsenb/src/stack/rrc/rrc.cc
+++ b/srsenb/src/stack/rrc/rrc.cc
@@ -805,7 +805,7 @@ uint32_t rrc::generate_sibs()
   sched_info_list_l& sched_info   = cfg.sib1.sched_info_list;
 
   // Store in cell_ctxt_list, the SIB cfg of each carrier
-  for (uint8_t cc_idx = 0; cc_idx < cfg.cell_list.size(); cc_idx++) {
+  for (uint32_t cc_idx = 0; cc_idx < cfg.cell_list.size(); cc_idx++) {
     cell_ctxt_list.push_back(std::unique_ptr<cell_ctxt_t>(new cell_ctxt_t{cc_idx, cfg.cell_list[cc_idx]}));
     cell_ctxt_t& cell_ctxt = *cell_ctxt_list.back();
 
@@ -834,7 +834,7 @@ uint32_t rrc::generate_sibs()
   }
 
   // generate and pack into SIB buffers
-  for (uint8_t cc_idx = 0; cc_idx < cfg.cell_list.size(); cc_idx++) {
+  for (uint32_t cc_idx = 0; cc_idx < cfg.cell_list.size(); cc_idx++) {
     cell_ctxt_t& cell_ctxt = *cell_ctxt_list[cc_idx];
     // msg is array of SI messages, each SI message msg[i] may contain multiple SIBs
     // all SIBs in a SI message msg[i] share the same periodicity
diff --git a/srsue/hdr/stack/rrc/rrc.h b/srsue/hdr/stack/rrc/rrc.h
index c1269a13f..b41b5407c 100644
--- a/srsue/hdr/stack/rrc/rrc.h
+++ b/srsue/hdr/stack/rrc/rrc.h
@@ -113,16 +113,13 @@ public:
     }
   }
 
-  cell_t() { cell_t({0, 0, 0}); }
-
-  explicit cell_t(phy_interface_rrc_lte::phy_cell_t phy_cell_)
-  {
+  cell_t() {
     gettimeofday(&last_update, nullptr);
     has_valid_sib1  = false;
     has_valid_sib2  = false;
     has_valid_sib3  = false;
     has_valid_sib13 = false;
-    phy_cell        = phy_cell_;
+    phy_cell        = {0,0,0};
     rsrp            = NAN;
     rsrq            = NAN;
     sib1            = {};
@@ -131,6 +128,11 @@ public:
     sib13           = {};
   }
 
+  cell_t(phy_interface_rrc_lte::phy_cell_t phy_cell_) : cell_t()
+  {
+    phy_cell = phy_cell_;
+  }
+
   uint32_t get_earfcn() { return phy_cell.earfcn; }
 
   uint32_t get_pci() { return phy_cell.pci; }