diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.cc
index 95a70fe7e..f26b1608d 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.cc
@@ -37,16 +37,15 @@ namespace own = std;
 namespace own = gsl;
 #endif
 
-GalileoE5bPcpsAcquisition::GalileoE5bPcpsAcquisition(ConfigurationInterface* configuration,
+GalileoE5bPcpsAcquisition::GalileoE5bPcpsAcquisition(const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
-    configuration_ = configuration;
     acq_parameters_.ms_per_code = 1;
-    acq_parameters_.SetFromConfiguration(configuration_, role, GALILEO_E5B_CODE_CHIP_RATE_CPS, GALILEO_E5B_OPT_ACQ_FS_SPS);
+    acq_parameters_.SetFromConfiguration(configuration, role, GALILEO_E5B_CODE_CHIP_RATE_CPS, GALILEO_E5B_OPT_ACQ_FS_SPS);
 
     DLOG(INFO) << "Role " << role;
 
@@ -60,8 +59,8 @@ GalileoE5bPcpsAcquisition::GalileoE5bPcpsAcquisition(ConfigurationInterface* con
     item_size_ = acq_parameters_.it_size;
     fs_in_ = acq_parameters_.fs_in;
 
-    acq_pilot_ = configuration_->property(role + ".acquire_pilot", false);
-    acq_iq_ = configuration_->property(role + ".acquire_iq", false);
+    acq_pilot_ = configuration->property(role + ".acquire_pilot", false);
+    acq_iq_ = configuration->property(role + ".acquire_iq", false);
     if (acq_iq_)
         {
             acq_pilot_ = false;
diff --git a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h
index 1cb80ef4c..06216cea9 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.h
@@ -38,7 +38,7 @@ public:
     /*!
      * \brief Constructor
      */
-    GalileoE5bPcpsAcquisition(ConfigurationInterface* configuration,
+    GalileoE5bPcpsAcquisition(const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -176,7 +176,6 @@ public:
     void set_resampler_latency(uint32_t latency_samples) override;
 
 private:
-    ConfigurationInterface* configuration_;
     pcps_acquisition_sptr acquisition_;
     Acq_Conf acq_parameters_;
     size_t item_size_;
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
index 853798a38..549628738 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
@@ -420,8 +420,8 @@ int signal_generator_c::general_work(int noutput_items __attribute__((unused)),
                                     // New random data bit
                                     current_data_bit_int_[sat] = (uniform_dist(e1) % 2) == 0 ? 1 : -1;
                                 }
-                            data_modulation_[sat] = current_data_bit_int_[sat] * (GALILEO_E5B_I_SECONDARY_CODE.at((ms_counter_[sat] + delay_sec_[sat]) % 20) == '0' ? 1 : -1);
-                            pilot_modulation_[sat] = (GALILEO_E5B_Q_SECONDARY_CODE[PRN_[sat] - 1].at((ms_counter_[sat] + delay_sec_[sat]) % 100) == '0' ? 1 : -1);
+                            data_modulation_[sat] = current_data_bit_int_[sat] * (GALILEO_E5B_I_SECONDARY_CODE[((ms_counter_[sat] + delay_sec_[sat]) % 20)] == '0' ? 1 : -1);
+                            pilot_modulation_[sat] = (GALILEO_E5B_Q_SECONDARY_CODE[PRN_[sat] - 1][((ms_counter_[sat] + delay_sec_[sat]) % 100)] == '0' ? 1 : -1);
 
                             ms_counter_[sat] = ms_counter_[sat] + static_cast<int>(round(1e3 * GALILEO_E5B_CODE_PERIOD_S));
 
diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index 78fad6c81..9df1d4a42 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -563,7 +563,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_5X(
 
 // ********* GALILEO E5b  CHANNEL *****************
 std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_7X(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& acq, const std::string& trk, const std::string& tlm, int channel,
     Concurrent_Queue<pmt::pmt_t>* queue)
 {
diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h
index f0d23a23d..125b95c4d 100644
--- a/src/core/receiver/gnss_block_factory.h
+++ b/src/core/receiver/gnss_block_factory.h
@@ -86,11 +86,11 @@ private:
         const std::string& acq, const std::string& trk, const std::string& tlm, int channel,
         Concurrent_Queue<pmt::pmt_t>* queue);
 
-    std::unique_ptr<GNSSBlockInterface> GetChannel_7X(ConfigurationInterface* configuration,
+    std::unique_ptr<GNSSBlockInterface> GetChannel_7X(const ConfigurationInterface* configuration,
         const std::string& acq, const std::string& trk, const std::string& tlm, int channel,
         Concurrent_Queue<pmt::pmt_t>* queue);
 
-    std::unique_ptr<GNSSBlockInterface> GetChannel_L5(ConfigurationInterface* configuration,
+    std::unique_ptr<GNSSBlockInterface> GetChannel_L5(const ConfigurationInterface* configuration,
         const std::string& acq, const std::string& trk, const std::string& tlm, int channel,
         Concurrent_Queue<pmt::pmt_t>* queue);