diff --git a/CMakeLists.txt b/CMakeLists.txt
index 977c6a7..02005cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,8 +102,7 @@ endforeach()
 # Boost
 # Inherit FairMQ Boost deps and add ours
 set(Boost_COMPONENTS ${FairMQ_Boost_COMPONENTS})
-list(INSERT Boost_COMPONENTS
-  range
+list(APPEND Boost_COMPONENTS
   filesystem
   iostreams
   unit_test_framework
diff --git a/src/ReadoutEmulator/CMakeLists.txt b/src/ReadoutEmulator/CMakeLists.txt
index 06f56f9..07e091e 100644
--- a/src/ReadoutEmulator/CMakeLists.txt
+++ b/src/ReadoutEmulator/CMakeLists.txt
@@ -13,10 +13,10 @@
 ## \brief  cmake for ReadoutEmulator
 
 set(EXE_EMU_SOURCES
-  CruMemoryHandler
-  CruEmulator
-  ReadoutDevice
-  runReadoutEmulatorDevice
+  CruMemoryHandler.cxx
+  CruEmulator.cxx
+  ReadoutDevice.cxx
+  runReadoutEmulatorDevice.cxx
 )
 
 add_executable(ReadoutEmulator ${EXE_EMU_SOURCES})
diff --git a/src/StfBuilder/CMakeLists.txt b/src/StfBuilder/CMakeLists.txt
index 403c2fb..49849c1 100644
--- a/src/StfBuilder/CMakeLists.txt
+++ b/src/StfBuilder/CMakeLists.txt
@@ -13,9 +13,9 @@
 ## \brief  cmake for StfBuilder
 
 set(EXE_STFB_SOURCES
-  StfBuilderInput
-  StfBuilderDevice
-  runStfBuilderDevice
+  StfBuilderInput.cxx
+  StfBuilderDevice.cxx
+  runStfBuilderDevice.cxx
 )
 
 add_library(StfBuilder_lib OBJECT ${EXE_STFB_SOURCES})
diff --git a/src/StfSender/CMakeLists.txt b/src/StfSender/CMakeLists.txt
index 224ddae..7ed3328 100644
--- a/src/StfSender/CMakeLists.txt
+++ b/src/StfSender/CMakeLists.txt
@@ -13,12 +13,12 @@
 ## \brief  cmake for StfSender
 
 set(EXE_STFS_SOURCES
-  StfSenderDevice
-  StfSenderOutput
-  StfSenderOutputFairMQ
-  StfSenderOutputUCX
-  StfSenderRpc
-  runStfSenderDevice
+  StfSenderDevice.cxx
+  StfSenderOutput.cxx
+  StfSenderOutputFairMQ.cxx
+  StfSenderOutputUCX.cxx
+  StfSenderRpc.cxx
+  runStfSenderDevice.cxx
 )
 
 add_library(StfSender_lib OBJECT ${EXE_STFS_SOURCES})
diff --git a/src/StfSender/StfSenderOutputUCX.cxx b/src/StfSender/StfSenderOutputUCX.cxx
index 5826505..22c7f07 100644
--- a/src/StfSender/StfSenderOutputUCX.cxx
+++ b/src/StfSender/StfSenderOutputUCX.cxx
@@ -235,7 +235,13 @@ bool StfSenderOutputUCX::disconnectTfBuilder(const std::string &pTfBuilderId)
       }
       return true;
     }
-    lConnInfo = std::move(mOutputMap.extract(lIt).mapped());
+    auto lConnInfoNode = mOutputMap.extract(lIt);
+    if (lConnInfoNode.empty()) {
+      // this should never happen, but the check makes the static analyzer happy
+      EDDLOG("StfSenderOutputUCX::disconnectTfBuilder: Internal error. tfb_id={}", pTfBuilderId);
+      return true;
+    }
+    lConnInfo = std::move(lConnInfoNode.mapped());
   }
 
   // Transport is only closed when other side execute close as well. Execute async
diff --git a/src/TfBuilder/CMakeLists.txt b/src/TfBuilder/CMakeLists.txt
index 96640f9..1fd6cac 100644
--- a/src/TfBuilder/CMakeLists.txt
+++ b/src/TfBuilder/CMakeLists.txt
@@ -13,12 +13,12 @@
 ## \brief  cmake for TfBuilder
 
 set(EXE_TFB_SOURCES
-  TfBuilderDevice
-  TfBuilderInput
-  TfBuilderInputFairMQ
-  TfBuilderInputUCX
-  TfBuilderRpc
-  runTfBuilderDevice
+  TfBuilderDevice.cxx
+  TfBuilderInput.cxx
+  TfBuilderInputFairMQ.cxx
+  TfBuilderInputUCX.cxx
+  TfBuilderRpc.cxx
+  runTfBuilderDevice.cxx
 )
 
 add_library(TfBuilder_lib OBJECT ${EXE_TFB_SOURCES})
diff --git a/src/TfScheduler/CMakeLists.txt b/src/TfScheduler/CMakeLists.txt
index c914cb5..ff010f3 100644
--- a/src/TfScheduler/CMakeLists.txt
+++ b/src/TfScheduler/CMakeLists.txt
@@ -13,14 +13,14 @@
 ## \brief  cmake for TfScheduler
 
 set(EXE_TFS_SOURCES
-  TfSchedulerDevice
-  TfSchedulerInstance
-  TfSchedulerInstanceRpc
-  TfSchedulerConnManager
-  TfSchedulerTfBuilderInfo
-  TfSchedulerStfInfo
-  TfSchedulerTokenManager
-  runTfScheduler
+  TfSchedulerDevice.cxx
+  TfSchedulerInstance.cxx
+  TfSchedulerInstanceRpc.cxx
+  TfSchedulerConnManager.cxx
+  TfSchedulerTfBuilderInfo.cxx
+  TfSchedulerStfInfo.cxx
+  TfSchedulerTokenManager.cxx
+  runTfScheduler.cxx
 )
 
 add_library(TfScheduler_lib OBJECT ${EXE_TFS_SOURCES})
diff --git a/src/TfScheduler/TfSchedulerTokenManager.h b/src/TfScheduler/TfSchedulerTokenManager.h
index 3de9214..acbb9b4 100644
--- a/src/TfScheduler/TfSchedulerTokenManager.h
+++ b/src/TfScheduler/TfSchedulerTokenManager.h
@@ -29,7 +29,10 @@
 #include <thread>
 #include <shared_mutex>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnull-dereference"
 #include <boost/lockfree/stack.hpp>
+#pragma GCC diagnostic pop
 #include <boost/lockfree/queue.hpp>
 
 namespace o2::DataDistribution
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index df0fd6b..023b949 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -24,16 +24,16 @@ if(UCX_FOUND)
 endif()
 
 set (LIB_COMMON_SOURCES
-  ReadoutDataModel
-  SubTimeFrameBuilder
-  SubTimeFrameDataModel
-  SubTimeFrameVisitors
-  SubTimeFrameFile
-  SubTimeFrameFileWriter
-  SubTimeFrameFileSink
-  SubTimeFrameFileReader
-  SubTimeFrameFileSource
-  SubTimeFrameDPL
+  ReadoutDataModel.cxx
+  SubTimeFrameBuilder.cxx
+  SubTimeFrameDataModel.cxx
+  SubTimeFrameVisitors.cxx
+  SubTimeFrameFile.cxx
+  SubTimeFrameFileWriter.cxx
+  SubTimeFrameFileSink.cxx
+  SubTimeFrameFileReader.cxx
+  SubTimeFrameFileSource.cxx
+  SubTimeFrameDPL.cxx
 )
 
 add_library(common OBJECT ${LIB_COMMON_SOURCES})
diff --git a/src/common/base/CMakeLists.txt b/src/common/base/CMakeLists.txt
index 6f62730..3c73b19 100644
--- a/src/common/base/CMakeLists.txt
+++ b/src/common/base/CMakeLists.txt
@@ -14,8 +14,8 @@
 
 #-------------------------------------------------------------------------------
 set (LIB_BASE_SOURCES
-  DataDistLogger
-  FilePathUtils
+  DataDistLogger.cxx
+  FilePathUtils.cxx
 )
 
 add_library(base OBJECT ${LIB_BASE_SOURCES})
diff --git a/src/common/discovery/CMakeLists.txt b/src/common/discovery/CMakeLists.txt
index 2c0e116..c127e5f 100644
--- a/src/common/discovery/CMakeLists.txt
+++ b/src/common/discovery/CMakeLists.txt
@@ -15,7 +15,7 @@
 #-------------------------------------------------------------------------------
 
 set (LIB_DISCOVERY_SOURCES
-  ConfigConsul
+  ConfigConsul.cxx
 )
 
 set (LIB_DISCOVERY_PROTOS
diff --git a/src/common/fmqtools/CMakeLists.txt b/src/common/fmqtools/CMakeLists.txt
index 2c7d6dc..4424b47 100644
--- a/src/common/fmqtools/CMakeLists.txt
+++ b/src/common/fmqtools/CMakeLists.txt
@@ -14,7 +14,7 @@
 
 #-------------------------------------------------------------------------------
 set (LIB_FMQTOOLS_SOURCES
-  FmqUtilities
+  FmqUtilities.cxx
 )
 
 add_library(fmqtools OBJECT ${LIB_FMQTOOLS_SOURCES})
diff --git a/src/common/monitoring/CMakeLists.txt b/src/common/monitoring/CMakeLists.txt
index 280bde7..4c5488a 100644
--- a/src/common/monitoring/CMakeLists.txt
+++ b/src/common/monitoring/CMakeLists.txt
@@ -14,7 +14,7 @@
 
 #-------------------------------------------------------------------------------
 set (LIB_MON_SOURCES
-  DataDistMonitoring
+  DataDistMonitoring.cxx
 )
 
 add_library(monitoring OBJECT ${LIB_MON_SOURCES})
diff --git a/src/common/rpc/CMakeLists.txt b/src/common/rpc/CMakeLists.txt
index 70191eb..491881b 100644
--- a/src/common/rpc/CMakeLists.txt
+++ b/src/common/rpc/CMakeLists.txt
@@ -14,8 +14,8 @@
 
 #-------------------------------------------------------------------------------
 set (LIB_BASE_SOURCES
-  StfSenderRpcClient
-  TfSchedulerRpcClient
+  StfSenderRpcClient.cxx
+  TfSchedulerRpcClient.cxx
 )
 
 add_library(rpc OBJECT ${LIB_BASE_SOURCES})
diff --git a/src/common/ucxtools/CMakeLists.txt b/src/common/ucxtools/CMakeLists.txt
index ac8001e..7716acc 100644
--- a/src/common/ucxtools/CMakeLists.txt
+++ b/src/common/ucxtools/CMakeLists.txt
@@ -14,7 +14,7 @@
 
 #-------------------------------------------------------------------------------
 set (LIB_UCXTOOLS_SOURCES
-  UCXUtilities
+  UCXUtilities.cxx
 )
 
 add_library(ucxtools OBJECT ${LIB_UCXTOOLS_SOURCES})
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 873d8f7..ef40430 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -15,8 +15,8 @@
 # Unit test for FilePathUtils class
 
 set(TEST_FILE_PATH_SOURCES
-  test_FilePathUtils
-  ../common/base/FilePathUtils
+  test_FilePathUtils.cxx
+  ../common/base/FilePathUtils.cxx
 )
 add_executable(test_FilePathUtils ${TEST_FILE_PATH_SOURCES})
 
@@ -38,7 +38,7 @@ add_test(NAME FilePathUtils_test COMMAND test_FilePathUtils)
 
 
 set(TEST_FMT_PATTERNS_SOURCES
-  test_FmtPatterns
+  test_FmtPatterns.cxx
 )
 add_executable(test_FmtPatterns ${TEST_FMT_PATTERNS_SOURCES})
 target_compile_definitions(test_FmtPatterns PRIVATE "BOOST_TEST_DYN_LINK=1")
@@ -53,7 +53,7 @@ add_test(NAME FmtPatterns_test COMMAND test_FmtPatterns)
 
 
 set(TEST_BITMAP_SOURCES
-  test_Bitmap
+  test_Bitmap.cxx
 )
 add_executable(test_Bitmap ${TEST_BITMAP_SOURCES})
 target_compile_definitions(test_Bitmap PRIVATE "BOOST_TEST_DYN_LINK=1")