diff --git a/algo/ca/TrackingDefs.h b/algo/ca/TrackingDefs.h
index f9a1970d74d2140e4afae3277bae1657515eba79..a20c95b9c45d64852f12ae5669cfba3407775263 100644
--- a/algo/ca/TrackingDefs.h
+++ b/algo/ca/TrackingDefs.h
@@ -21,7 +21,7 @@ namespace cbm::algo
   }
   namespace sts
   {
-    class Hit;
+    struct Hit;
   }
   namespace much
   {
@@ -33,7 +33,7 @@ namespace cbm::algo
   }
   namespace tof
   {
-    class Hit;
+    struct Hit;
   }
 
   namespace ca
diff --git a/algo/ca/core/CMakeLists.txt b/algo/ca/core/CMakeLists.txt
index 3e2065b1c642b5fb109374ec92d08a6a0991c3cf..eb0d7c8d51895945b0aac9f9793a6b07a7e35744 100644
--- a/algo/ca/core/CMakeLists.txt
+++ b/algo/ca/core/CMakeLists.txt
@@ -41,6 +41,12 @@ set(SRCS
 
 SET_SOURCE_FILES_PROPERTIES(${SRCS} PROPERTIES COMPILE_FLAGS "-O3")
 
+If(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  ADD_DEFINITIONS(-Wall -Wextra -Wsign-promo -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wno-parentheses) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast : wait for other parts of cbmroot\root.
+Else()
+  ADD_DEFINITIONS(-Wall -Wextra -Wsign-promo -Wno-pmf-conversions -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wstrict-null-sentinel -Wno-non-template-friend -Wno-parentheses -Wmissing-field-initializers) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast : wait for other parts of cbmroot\root.
+EndIf()
+
 add_library(CaCore SHARED ${SRCS})
 
 target_include_directories(CaCore
diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index 773cd40127d4a43aeb2ac8e900ae9b167f6054b5..5f69db7bb0d801d803294a6e4f4c7544a249caa7 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -97,7 +97,7 @@ set(HEADERS
 )
 
 If(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  ADD_DEFINITIONS(-Wall -Wsign-promo -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wno-parentheses) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast : wait for other parts of cbmroot\root.
+  ADD_DEFINITIONS(-Wall -Wextra -Wsign-promo -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wno-parentheses) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast : wait for other parts of cbmroot\root.
 
   # -- - Check for compiler flags
   CHECK_CXX_COMPILER_FLAG("-Werror -Wno-pmf-conversions" HAS_PMF)
@@ -118,7 +118,7 @@ If(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     ADD_DEFINITIONS(-Wno-non-template-friend)
   EndIf()
 Else()
-  ADD_DEFINITIONS(-Wall -Wsign-promo -Wno-pmf-conversions -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wstrict-null-sentinel -Wno-non-template-friend -Wno-parentheses) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast : wait for other parts of cbmroot\root.
+  ADD_DEFINITIONS(-Wall -Wextra -Wsign-promo -Wno-pmf-conversions -Wctor-dtor-privacy -Wreorder -Wno-deprecated -Wstrict-null-sentinel -Wno-non-template-friend -Wno-parentheses) # -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast : wait for other parts of cbmroot\root.
 EndIf()
 
 IF(SSE_FOUND)
diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h
index 54bba0ff0c2b4d8be96d0b5460e9edfe677ec084..1ee02e02c5c1f6b9836f4fa19c4c86ffa1cc5cae 100644
--- a/reco/L1/CbmL1.h
+++ b/reco/L1/CbmL1.h
@@ -256,7 +256,7 @@ class CbmL1 : public FairTask {
   void SetGlobalMode() { fTrackingMode = ca::Framework::TrackingMode::kGlobal; }
 
   /// Sets misalignment of the detector
-  void SetMisalignment(ca::EDetectorID det, float dx, float dy, float dt) { fvMisalignment[det] = {dx, dy, dt}; }
+  void SetMisalignment(ca::EDetectorID det, float dx, float dy, float dt) { fvMisalignment[det] = {{dx, dy, dt}}; }
 
   void SetMisalignmentMvd(float dx, float dy, float dt) { SetMisalignment(ca::EDetectorID::kMvd, dx, dy, dt); }
   void SetMisalignmentSts(float dx, float dy, float dt) { SetMisalignment(ca::EDetectorID::kSts, dx, dy, dt); }
@@ -474,7 +474,7 @@ class CbmL1 : public FairTask {
 
   //std::unique_ptr<CbmCaMCModule> fpMCModule = nullptr;  ///< MC-module for tracking
 
-  cbm::ca::DetIdArr_t<std::array<float, 3>> fvMisalignment{{0.}};  ///< Misalignment
+  cbm::ca::DetIdArr_t<std::array<float, 3>> fvMisalignment{{{{{0.f, 0.f, 0.f}}}}};  ///< Misalignment
 
  public:
   // ** Basic data members **