diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc
index b7f29a012..589af32c5 100644
--- a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc
@@ -66,7 +66,7 @@ RawArraySignalSource::RawArraySignalSource(ConfigurationInterface* configuration
     int sampling_freq_;
     sampling_freq_ = configuration->property(role + ".sampling_freq", 5000000);
 
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             raw_array_source_ = gr::dbfcttc::raw_array::make(eth_device_.c_str(), channels_, snapshots_per_frame_, inter_frame_delay_, sampling_freq_);
@@ -97,9 +97,7 @@ RawArraySignalSource::RawArraySignalSource(ConfigurationInterface* configuration
 }
 
 
-RawArraySignalSource::~RawArraySignalSource()
-{
-}
+RawArraySignalSource::~RawArraySignalSource() = default;
 
 
 void RawArraySignalSource::connect(gr::top_block_sptr top_block)
diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.h b/src/algorithms/signal_source/adapters/raw_array_signal_source.h
index 9af4df30f..321895cef 100644
--- a/src/algorithms/signal_source/adapters/raw_array_signal_source.h
+++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.h
@@ -29,8 +29,8 @@
  */
 
 
-#ifndef RAW_ARRAY_SIGNAL_SOURCE_H_
-#define RAW_ARRAY_SIGNAL_SOURCE_H_
+#ifndef GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H_
+#define GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H_
 
 #include "gnss_block_interface.h"
 #include <gnuradio/blocks/file_sink.h>
@@ -90,4 +90,4 @@ private:
     boost::shared_ptr<gr::msg_queue> queue_;
 };
 
-#endif /*RAW_ARRAY_SIGNAL_SOURCE_H_*/
+#endif /*GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H_*/
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index b30c2295e..469960d47 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -169,19 +169,26 @@ if(OS_IS_MACOSX)
 endif()
 
 if(ENABLE_FLEXIBAND AND TELEORBIT_FOUND)
-    target_compile_definitions(core_receiver
+    target_link_libraries(core_receiver
         PRIVATE
             Gnuradio::teleorbit
     )
 endif()
 
 if(ENABLE_GN3S AND GRGN3S_FOUND)
-    target_compile_definitions(core_receiver
+    target_link_libraries(core_receiver
         PRIVATE
             Gnuradio::gn3s
     )
 endif()
 
+if(ENABLE_ARRAY AND GRDBFCTTC_FOUND)
+    target_link_libraries(core_receiver
+        PRIVATE
+            Gnuradio::dbfcttc
+    )
+endif()
+
 if(ENABLE_CLANG_TIDY)
     if(CLANG_TIDY_EXE)
         set_target_properties(core_receiver