diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc
index 28caa67e7..859db4f1c 100644
--- a/src/algorithms/channel/libs/channel_msg_receiver_cc.cc
+++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.cc
@@ -42,7 +42,7 @@ channel_msg_receiver_cc::channel_msg_receiver_cc(std::shared_ptr<ChannelFsm> cha
     this->message_port_register_in(pmt::mp("events"));
     this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
-        [this](auto&& PH1) { msg_handler_events(PH1); });
+        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
 #else
         boost::bind(&channel_msg_receiver_cc::msg_handler_events, this, _1));
 #endif
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc
index 0d40b7928..b97e15cc6 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc
@@ -74,7 +74,7 @@ hybrid_observables_gs::hybrid_observables_gs(const Obs_Conf &conf_) : gr::block(
     this->message_port_register_in(pmt::mp("pvt_to_observables"));
     this->set_msg_handler(pmt::mp("pvt_to_observables"),
 #if HAS_GENERIC_LAMBDA
-        [this](auto &&PH1) { msg_handler_pvt_to_observables(PH1); });
+        [this](pmt::pmt_t &&PH1) { msg_handler_pvt_to_observables(PH1); });
 #else
         boost::bind(&hybrid_observables_gs::msg_handler_pvt_to_observables, this, _1));
 #endif
diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
index feba045ca..9b97034dd 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
@@ -135,12 +135,8 @@ rtl_tcp_signal_source_c::rtl_tcp_signal_source_c(const std::string &address,
 
     // 6. Start reading
     boost::asio::async_read(socket_, boost::asio::buffer(data_),
-#if HAS_GENERIC_LAMBDA
-        [this](auto &&PH1, auto &&PH2) { handle_read(PH1, PH2); });
-#else
-        boost::bind(&rtl_tcp_signal_source_c::handle_read,
-            this, _1, _2));
-#endif
+        boost::bind(&rtl_tcp_signal_source_c::handle_read, this, _1, _2));  // NOLINT(modernize-avoid-bind)
+
     boost::thread(
 #if HAS_GENERIC_LAMBDA
         [ObjectPtr = &io_context_] { ObjectPtr->run(); });
@@ -320,11 +316,7 @@ void rtl_tcp_signal_source_c::handle_read(const boost::system::error_code &ec,
             // Read some more
             boost::asio::async_read(socket_,
                 boost::asio::buffer(data_),
-#if HAS_GENERIC_LAMBDA
-                [this](auto &&PH1, auto &&PH2) { handle_read(PH1, PH2); });
-#else
-                boost::bind(&rtl_tcp_signal_source_c::handle_read, this, _1, _2));
-#endif
+                boost::bind(&rtl_tcp_signal_source_c::handle_read, this, _1, _2));  // NOLINT(modernize-avoid-bind)
         }
 }
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
index 886c5882e..02f52fada 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
@@ -100,7 +100,7 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl
     this->set_msg_handler(
         pmt::mp("telemetry_to_trk"),
 #if HAS_GENERIC_LAMBDA
-        [this](auto &&PH1) { msg_handler_telemetry_to_trk(PH1); });
+        [this](pmt::pmt_t &&PH1) { msg_handler_telemetry_to_trk(PH1); });
 #else
         boost::bind(&dll_pll_veml_tracking::msg_handler_telemetry_to_trk, this, _1));
 #endif
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
index 031c23fa9..6e479e098 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
@@ -90,7 +90,7 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
     this->message_port_register_in(pmt::mp("telemetry_to_trk"));
     this->set_msg_handler(pmt::mp("telemetry_to_trk"),
 #if HAS_GENERIC_LAMBDA
-        [this](auto &&PH1) { msg_handler_telemetry_to_trk(PH1); });
+        [this](pmt::pmt_t &&PH1) { msg_handler_telemetry_to_trk(PH1); });
 #else
         boost::bind(&dll_pll_veml_tracking_fpga::msg_handler_telemetry_to_trk, this, _1));
 #endif
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 38ba2aeeb..c0beb4ffe 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -113,7 +113,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::glonass_l1_ca_dll_pll_c_aid_tracking_cc
 
     this->set_msg_handler(pmt::mp("preamble_timestamp_s"),
 #if HAS_GENERIC_LAMBDA
-        [this](auto &&PH1) { msg_handler_preamble_index(PH1); });
+        [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); });
 #else
         boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, _1));
 #endif
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
index 3fafe53b3..1095b2a75 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
@@ -110,7 +110,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_sc::glonass_l1_ca_dll_pll_c_aid_tracking_sc
     this->message_port_register_in(pmt::mp("preamble_timestamp_s"));
     this->set_msg_handler(pmt::mp("preamble_timestamp_s"),
 #if HAS_GENERIC_LAMBDA
-        [this](auto &&PH1) { msg_handler_preamble_index(PH1); });
+        [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); });
 #else
         boost::bind(&glonass_l1_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, _1));
 #endif
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
index c36d4aa07..89bf850be 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
@@ -105,7 +105,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::glonass_l2_ca_dll_pll_c_aid_tracking_cc
 
     this->set_msg_handler(pmt::mp("preamble_timestamp_s"),
 #if HAS_GENERIC_LAMBDA
-        [this](auto &&PH1) { msg_handler_preamble_index(PH1); });
+        [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); });
 #else
         boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index, this, _1));
 #endif
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
index 92070be23..e12ecf3ec 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
@@ -103,7 +103,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_sc::glonass_l2_ca_dll_pll_c_aid_tracking_sc
     this->message_port_register_in(pmt::mp("preamble_timestamp_s"));
     this->set_msg_handler(pmt::mp("preamble_timestamp_s"),
 #if HAS_GENERIC_LAMBDA
-        [this](auto &&PH1) { msg_handler_preamble_index(PH1); });
+        [this](pmt::pmt_t &&PH1) { msg_handler_preamble_index(PH1); });
 #else
         boost::bind(&glonass_l2_ca_dll_pll_c_aid_tracking_sc::msg_handler_preamble_index, this, _1));
 #endif
diff --git a/src/core/libs/channel_status_msg_receiver.cc b/src/core/libs/channel_status_msg_receiver.cc
index 6bbc1e766..db275750f 100644
--- a/src/core/libs/channel_status_msg_receiver.cc
+++ b/src/core/libs/channel_status_msg_receiver.cc
@@ -39,7 +39,7 @@ channel_status_msg_receiver::channel_status_msg_receiver() : gr::block("channel_
     this->message_port_register_in(pmt::mp("status"));
     this->set_msg_handler(pmt::mp("status"),
 #if HAS_GENERIC_LAMBDA
-        [this](auto&& PH1) { msg_handler_events(PH1); });
+        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
 #else
         boost::bind(&channel_status_msg_receiver::msg_handler_events, this, _1));
 #endif
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc
index 86d4cc137..cadc0f2d2 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.cc
@@ -56,7 +56,7 @@ Acquisition_msg_rx::Acquisition_msg_rx() : gr::block("Acquisition_msg_rx", gr::i
     this->message_port_register_in(pmt::mp("events"));
     this->set_msg_handler(pmt::mp("events"),
 #if HAS_GENERIC_LAMBDA
-        [this](auto&& PH1) { msg_handler_events(PH1); });
+        [this](pmt::pmt_t&& PH1) { msg_handler_events(PH1); });
 #else
         boost::bind(&Acquisition_msg_rx::msg_handler_events, this, _1));
 #endif