diff --git a/CTestCustom.cmake b/CTestCustom.cmake
index 7bfd31ced481d61ae2eb347a21443bbdac1e1e88..a63b438446cf85290f4e2ed0b72163392abe3892 100644
--- a/CTestCustom.cmake
+++ b/CTestCustom.cmake
@@ -42,7 +42,6 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
 
         # -- warnings from our external packages
         "external/flib_dpb"
-#        "external/flib_dpb_20"
         "external/ipc" 
         "include/AnalysisTree"
 
diff --git a/MQ/hitbuilder/CbmDeviceHitBuilderTof.cxx b/MQ/hitbuilder/CbmDeviceHitBuilderTof.cxx
index 30a21ab53d523724bf7f72541ce7a8fcc58db3e5..5ced4dcd97c177751b76711595e3eaeccecc7712 100644
--- a/MQ/hitbuilder/CbmDeviceHitBuilderTof.cxx
+++ b/MQ/hitbuilder/CbmDeviceHitBuilderTof.cxx
@@ -72,7 +72,7 @@ using namespace std;
 static Int_t iMess                = 0;
 static Int_t iIndexDut            = 0;
 static Double_t StartAnalysisTime = 0.;
-const Double_t cLight             = 29.9792;  // in cm/ns
+//const Double_t cLight             = 29.9792;  // in cm/ns
 static FairRootManager* rootMgr   = NULL;
 static Int_t iRunId               = 1;
 
@@ -82,14 +82,12 @@ CbmDigiManager* fDigiMan;
 
 CbmDeviceHitBuilderTof::CbmDeviceHitBuilderTof()
   : fNumMessages(0)
-  , fDigi(nullptr)
   , fGeoMan(NULL)
   , fGeoHandler(new CbmTofGeoHandler())
   , fTofId(NULL)
   , fDigiPar(NULL)
   , fChannelInfo(NULL)
   , fDigiBdfPar(NULL)
-  , pDigiIn(NULL)
   , fiNDigiIn(0)
   , fvDigiIn()
   , fEventHeader()
@@ -109,7 +107,6 @@ CbmDeviceHitBuilderTof::CbmDeviceHitBuilderTof()
   , fdEvent(0)
   , fiMaxEvent(-1)
   , fiRunId(111)
-  , fbSwapChannelSides(kFALSE)
   , fiOutputTreeEntry(0)
   , fiFileIndex(0)
   , fStorDigi()
@@ -180,10 +177,7 @@ CbmDeviceHitBuilderTof::CbmDeviceHitBuilderTof()
   , fhTRpcCluMemMulDTLastHits()
   , fhSeldT()
   , dTRef(0.)
-  , fdTRefMax(0.)
   , fCalMode(0)
-  , fCalSel(0)
-  , fCalSmAddr(0)
   , fdCaldXdYMax(0.)
   , fiCluMulMax(0)
   , fTRefMode(0)
@@ -212,23 +206,18 @@ CbmDeviceHitBuilderTof::CbmDeviceHitBuilderTof()
   , fTRefDifMax(0.)
   , fTotMax(0.)
   , fTotMin(0.)
-  , fTotOff(0.)
   , fTotMean(0.)
   , fdDelTofMax(60.)
-  , fTotPreRange(0.)
   , fMaxTimeDist(0.)
   , fdChannelDeadtime(0.)
   , fdMemoryTime(0.)
-  , fdYFitMin(1.E6)
   , fEnableMatchPosScaling(kTRUE)
-  , fEnableAvWalk(kFALSE)
   , fbPs2Ns(kFALSE)
   , fCalParFileName("")
   , fOutHstFileName("")
   , fOutRootFileName("")
   , fCalParFile(NULL)
-  , fOutRootFile(NULL)
-  , fRootEvent(NULL) {}
+  , fOutRootFile(NULL) {}
 
 CbmDeviceHitBuilderTof::~CbmDeviceHitBuilderTof() {
   if (NULL != fOutRootFile) {
@@ -823,7 +812,7 @@ Bool_t CbmDeviceHitBuilderTof::InitCalibParameter() {
       if (NULL != hSvel) {
         gDirectory->cd(oldir->GetPath());
         //TProfile *hSvelmem =
-        (TProfile*) hSvel->Clone();
+        //(TProfile*) hSvel->Clone();
         gDirectory->cd(curdir->GetPath());
       } else {
         LOG(info) << "Svel histogram not found for module type " << iSmType;
@@ -835,7 +824,7 @@ Bool_t CbmDeviceHitBuilderTof::InitCalibParameter() {
         if (NULL != hFparcur) {
           gDirectory->cd(oldir->GetPath());
           //TProfile *hFparmem =
-          (TProfile*) hFparcur->Clone();
+          //(TProfile*) hFparcur->Clone();
           gDirectory->cd(curdir->GetPath());
         }
       }
diff --git a/MQ/hitbuilder/CbmDeviceHitBuilderTof.h b/MQ/hitbuilder/CbmDeviceHitBuilderTof.h
index 2f5e0b3bcc7c2c2a37c99d30b0577778387a5501..726dfff8b8408f91614af085bcee359f96554136 100644
--- a/MQ/hitbuilder/CbmDeviceHitBuilderTof.h
+++ b/MQ/hitbuilder/CbmDeviceHitBuilderTof.h
@@ -113,7 +113,6 @@ private:
                                                "tofdigis",
                                                "tofhits",
                                                "syscmd"};
-  CbmTofDigi* fDigi;
 
   TGeoManager* fGeoMan;
   // ToF geometry variables
@@ -123,8 +122,6 @@ private:
   CbmTofCell* fChannelInfo;
   CbmTofDigiBdfPar* fDigiBdfPar;
   // Input variables
-  TClonesArray* fTofDigisColl;  // TOF Digis
-  CbmTofDigi* pDigiIn;
   Int_t fiNDigiIn;
   std::vector<CbmTofDigi> fvDigiIn;
   std::vector<int> fEventHeader;
@@ -133,10 +130,8 @@ private:
   // Output variables
   // TClonesArray* fTofCalDigisColl;      // Calibrated TOF Digis
   std::vector<CbmTofDigi>* fTofCalDigiVec    = nullptr;  // Calibrated TOF Digis
-  std::vector<CbmTofDigi>* fTofCalDigiVecOut = nullptr;  // Calibrated TOF Digis
   TClonesArray* fTofHitsColl;                            // TOF hits
   TClonesArray* fTofDigiMatchColl;                       // TOF Digi Links
-  TClonesArray* fTofCalDigisCollOut;                     // Calibrated TOF Digis
   TClonesArray* fTofHitsCollOut;                         // TOF hits
   TClonesArray* fTofDigiMatchCollOut;                    // TOF Digi Links
   Int_t fiNbHits;  // Index of the CbmTofHit TClonesArray
@@ -158,7 +153,6 @@ private:
   Int_t fiMaxEvent;
   Int_t fiRunId;
 
-  Bool_t fbSwapChannelSides;
   Int_t fiOutputTreeEntry;
   Int_t fiFileIndex;
 
@@ -264,10 +258,7 @@ private:
 
   // Calibration control variables
   Double_t dTRef;
-  Double_t fdTRefMax;
   Int_t fCalMode;
-  Int_t fCalSel;
-  Int_t fCalSmAddr;
   Double_t fdCaldXdYMax;
   Int_t fiCluMulMax;
   Int_t fTRefMode;
@@ -304,17 +295,13 @@ private:
   Double_t fTRefDifMax;
   Double_t fTotMax;
   Double_t fTotMin;
-  Double_t fTotOff;
   Double_t fTotMean;
   Double_t fdDelTofMax;
-  Double_t fTotPreRange;
   Double_t fMaxTimeDist;
   Double_t fdChannelDeadtime;
   Double_t fdMemoryTime;
-  Double_t fdYFitMin;
 
   Bool_t fEnableMatchPosScaling;
-  Bool_t fEnableAvWalk;
   Bool_t fbPs2Ns;  // convert input raw digis from ps to ns
 
   TString fCalParFileName;  // name of the file name with Calibration Parameters
@@ -323,7 +310,6 @@ private:
   TString fOutRootFileName;  // name of the output file name with Digis & Hits
   TFile* fCalParFile;        // pointer to Calibration Parameter file
   TFile* fOutRootFile;       // pointer to root output file
-  TTree* fRootEvent;         // pointer to root event tree
 };
 
 // special class to expose protected TMessage constructor
diff --git a/MQ/mcbm/CbmDeviceMcbmEventSink.cxx b/MQ/mcbm/CbmDeviceMcbmEventSink.cxx
index 1c025419a0753df25de44f6c409e87b1da5600b6..f9dfbab2c369dd8a01c81c9439ce6333a04bd266 100644
--- a/MQ/mcbm/CbmDeviceMcbmEventSink.cxx
+++ b/MQ/mcbm/CbmDeviceMcbmEventSink.cxx
@@ -381,7 +381,7 @@ bool CbmDeviceMcbmEventSink::HandleData(FairMQParts& parts, int /*index*/) {
     fmFullTsStorage.emplace_hint(
       fmFullTsStorage.end(),
       std::pair<uint64_t, CbmUnpackedTimeslice>(
-        fTsMetaData->GetIndex(), std::move(CbmUnpackedTimeslice(parts))));
+        fTsMetaData->GetIndex(), CbmUnpackedTimeslice(parts)));
   }  // else of if( fuPrevTsIndex + 1 == fTsMetaData->GetIndex() ||  ( 0 == fuPrevTsIndex && 0 == fulTsCounter && 0 == fTsMetaData->GetIndex() )
   LOG(debug) << "TS metadata checked";
 
diff --git a/MQ/mcbm/CbmDeviceMcbmEventSink.h b/MQ/mcbm/CbmDeviceMcbmEventSink.h
index 4dfb3076f03a07c41baf968b1af99f9bfe8ff71b..006b2e992dc30e3a312cc0965089bd868286111e 100644
--- a/MQ/mcbm/CbmDeviceMcbmEventSink.h
+++ b/MQ/mcbm/CbmDeviceMcbmEventSink.h
@@ -137,7 +137,6 @@ private:
   /// Data storage
   FairRunOnline* fpRun           = nullptr;
   FairRootManager* fpFairRootMgr = nullptr;
-  TFile* fpOutRootFile           = nullptr;
 
   /// Array of histograms to send to the histogram server
   TObjArray fArrayHisto = {};
diff --git a/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx b/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
index a350bbee95489b0b9c465bca62c8bfa93c1b2bc8..0ad8490f784f081b840060ba9c9cb31711b6815c 100644
--- a/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
@@ -77,8 +77,8 @@ void CbmTrdTracksConverter::FillTrdTracks() {
     if (itrd < 0) continue;
 
     auto trd_track = static_cast<CbmTrdTrack*>(cbm_trd_tracks_->At(itrd));
-    auto trd_match = static_cast<CbmTrackMatchNew*>(cbm_trd_tracks_->At(itrd));
-    Int_t itrdMC   = (trd_match ? trd_match->GetMatchedLink().GetIndex() : -1);
+//    auto trd_match = static_cast<CbmTrackMatchNew*>(cbm_trd_tracks_->At(itrd));
+//    Int_t itrdMC   = (trd_match ? trd_match->GetMatchedLink().GetIndex() : -1);
 
     auto& track = trd_tracks_->AddChannel(branch);
     TVector3 mom, mom_last;
diff --git a/cmake/modules/ROOTMacros.cmake b/cmake/modules/ROOTMacros.cmake
index b97617c47d284f0f2cc82a76a7579a4ea5b7b341..2b3152c50de3db18691f355c842815d170df0ad0 100644
--- a/cmake/modules/ROOTMacros.cmake
+++ b/cmake/modules/ROOTMacros.cmake
@@ -42,17 +42,8 @@ Macro(ROOT_GENERATE_DICTIONARY)
   # For the new implementation some CMake variables has to be defined
   # before calling the macro.
 
-  If(${ARGC} EQUAL 0)
-#    Message("New Version")
-    ROOT_GENERATE_DICTIONARY_NEW()
-  Else(${ARGC} EQUAL 0)
-    If(${ARGC} EQUAL 4)
-#      Message("Old Version")
-      ROOT_GENERATE_DICTIONARY_OLD("${ARGV0}" "${ARGV1}" "${ARGV2}" "${ARGV3}")
-    Else(${ARGC} EQUAL 4)
-      Message(FATAL_ERROR "Has to be implemented")
-    EndIf(${ARGC} EQUAL 4)
-  EndIf(${ARGC} EQUAL 0)
+  # Old Implementation was removed since unused
+  ROOT_GENERATE_DICTIONARY_NEW()
 
 EndMacro(ROOT_GENERATE_DICTIONARY)
 
@@ -121,70 +112,21 @@ Macro(ROOT_GENERATE_DICTIONARY_NEW)
   # time we run make. To pass the variables a script is created containing the
   # correct values for the needed variables
 
-  IF(FAIRROOTPATH)
-    Configure_File(${FAIRROOTPATH}/share/fairbase/cmake/scripts/generate_dictionary_root.sh.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/generate_dictionary_${script_name}.sh
-                  )
-    #EXEC_PROGRAM(/bin/chmod ARGS "u+x ${CMAKE_CURRENT_BINARY_DIR}/generate_dictionary_${script_name}.sh")
-    execute_process(COMMAND /bin/chmod u+x ${CMAKE_CURRENT_BINARY_DIR}/generate_dictionary_${script_name}.sh OUTPUT_QUIET)
+  Configure_File(${PROJECT_SOURCE_DIR}/cmake/scripts/generate_dictionary_root.sh.in
+                 ${CMAKE_CURRENT_BINARY_DIR}/generate_dictionary_${script_name}.sh
+                )
+  execute_process(COMMAND /bin/chmod u+x ${CMAKE_CURRENT_BINARY_DIR}/generate_dictionary_${script_name}.sh OUTPUT_QUIET)
 
-  ELSE(FAIRROOTPATH)
-    Configure_File(${PROJECT_SOURCE_DIR}/cmake/scripts/generate_dictionary_root.sh.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/generate_dictionary_${script_name}.sh
-                  )
-  ENDIF(FAIRROOTPATH)
-
-
-  If (ROOT_FOUND_VERSION GREATER 59999)
-    Add_Custom_Command(OUTPUT  ${OUTPUT_FILES}
-                       COMMAND ${CMAKE_CURRENT_BINARY_DIR}/generate_dictionary_${script_name}.sh
-                       COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/${Int_PCMFILE} ${LIBRARY_OUTPUT_PATH}/${Int_PCMFILE}
-                       DEPENDS ${HDRS} ${Int_LINKDEF}
-                      )
-    Install(FILES ${LIBRARY_OUTPUT_PATH}/${Int_PCMFILE} ${Int_ROOTMAPFILE} DESTINATION lib)
-  Else()
-    Add_Custom_Command(OUTPUT  ${OUTPUT_FILES}
-                       COMMAND ${CMAKE_CURRENT_BINARY_DIR}/generate_dictionary_${script_name}.sh
-                       DEPENDS ${HDRS} ${Int_LINKDEF}
-                      )
-  EndIf()
+  Add_Custom_Command(OUTPUT  ${OUTPUT_FILES}
+                     COMMAND ${CMAKE_CURRENT_BINARY_DIR}/generate_dictionary_${script_name}.sh
+                     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/${Int_PCMFILE} ${LIBRARY_OUTPUT_PATH}/${Int_PCMFILE}
+                     DEPENDS ${HDRS} ${Int_LINKDEF}
+                    )
+  Install(FILES ${LIBRARY_OUTPUT_PATH}/${Int_PCMFILE} ${Int_ROOTMAPFILE} DESTINATION lib)
 
 endmacro(ROOT_GENERATE_DICTIONARY_NEW)
 
 
-MACRO (ROOT_GENERATE_DICTIONARY_OLD INFILES LINKDEF_FILE OUTFILE INCLUDE_DIRS_IN)
-
-  set(INCLUDE_DIRS)
-
-  foreach (_current_FILE ${INCLUDE_DIRS_IN})
-    set(INCLUDE_DIRS ${INCLUDE_DIRS} -I${_current_FILE})
-  endforeach (_current_FILE ${INCLUDE_DIRS_IN})
-
-#  Message("Definitions: ${DEFINITIONS}")
-#  MESSAGE("INFILES: ${INFILES}")
-#  MESSAGE("OutFILE: ${OUTFILE}")
-#  MESSAGE("LINKDEF_FILE: ${LINKDEF_FILE}")
-#  MESSAGE("INCLUDE_DIRS: ${INCLUDE_DIRS}")
-
-  STRING(REGEX REPLACE "^(.*)\\.(.*)$" "\\1.h" bla "${OUTFILE}")
-#  MESSAGE("BLA: ${bla}")
-  SET (OUTFILES ${OUTFILE} ${bla})
-
-
-  if (CMAKE_SYSTEM_NAME MATCHES Linux)
-    ADD_CUSTOM_COMMAND(OUTPUT ${OUTFILES}
-       COMMAND LD_LIBRARY_PATH=${ROOT_LIBRARY_DIR}:${_intel_lib_dirs} ROOTSYS=${ROOTSYS} ${ROOT_CINT_EXECUTABLE}
-       ARGS -f ${OUTFILE} -c -DHAVE_CONFIG_H ${INCLUDE_DIRS} ${INFILES} ${LINKDEF_FILE} DEPENDS ${INFILES} ${LINKDEF_FILE})
-  else (CMAKE_SYSTEM_NAME MATCHES Linux)
-    if (CMAKE_SYSTEM_NAME MATCHES Darwin)
-      ADD_CUSTOM_COMMAND(OUTPUT ${OUTFILES}
-       COMMAND DYLD_LIBRARY_PATH=${ROOT_LIBRARY_DIR} ROOTSYS=${ROOTSYS} ${ROOT_CINT_EXECUTABLE}
-       ARGS -f ${OUTFILE} -c -DHAVE_CONFIG_H ${INCLUDE_DIRS} ${INFILES} ${LINKDEF_FILE} DEPENDS ${INFILES} ${LINKDEF_FILE})
-    endif (CMAKE_SYSTEM_NAME MATCHES Darwin)
-  endif (CMAKE_SYSTEM_NAME MATCHES Linux)
-
-ENDMACRO (ROOT_GENERATE_DICTIONARY_OLD)
-
 MACRO (GENERATE_ROOT_TEST_SCRIPT SCRIPT_FULL_NAME)
 
   get_filename_component(path_name ${SCRIPT_FULL_NAME} PATH)
diff --git a/cmake/scripts/generate_dictionary_root.sh.in b/cmake/scripts/generate_dictionary_root.sh.in
new file mode 100755
index 0000000000000000000000000000000000000000..ed36e4c0765d84cbe8bacb6c11366737fc3a3cc3
--- /dev/null
+++ b/cmake/scripts/generate_dictionary_root.sh.in
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# This macro is used to generate the ROOT dictionaries
+# To use the ctest launchers one needs some environment variables which
+# are only present when running CMake. To have the same environment at
+# the time the dictionary is build this script is used which is build
+# at the time cmake runs.
+
+# Setup the needed environment
+export LD_LIBRARY_PATH=@MY_LD_LIBRARY_PATH@
+export DYLD_LIBRARY_PATH=@MY_LD_LIBRARY_PATH@
+export ROOTSYS=@ROOTSYS@
+
+@ROOT_CINT_EXECUTABLE@ -f @Int_DICTIONARY@ @EXTRA_DICT_PARAMETERS_STR@ @Int_DEF_STR@ @Int_INC_STR@ @Int_HDRS_STR@ @Int_LINKDEF@
diff --git a/core/data/tof/CbmTofDetectorId.h b/core/data/tof/CbmTofDetectorId.h
index 802d2a3d3caf6c908f152435a9f4161afc032dec..528eccd138fa61dc980c153ee651d8708e8e7062 100644
--- a/core/data/tof/CbmTofDetectorId.h
+++ b/core/data/tof/CbmTofDetectorId.h
@@ -40,7 +40,8 @@ public:
     , fSModule(smodule)
     , fCounter(counter)
     , fGap(gap)
-    , fCell(cell) {};
+    , fCell(cell)
+    , fCounterType(0) {};
 
   CbmTofDetectorInfo(ECbmModuleId detsystem,
                      Int_t smtype,
@@ -53,9 +54,8 @@ public:
     , fSModule(smodule)
     , fCounter(counter)
     , fGap(gap)
-    , fCell(cell) {
-    fCounterType = 0;
-  };
+    , fCell(cell)
+    , fCounterType(0) {};
 
   CbmTofDetectorInfo(ECbmModuleId detsystem,
                      Int_t smtype,
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx
index adeb0c52ff4b90e8a44feef533b133497b1e3691..8bba5ddaa9145c4d49212d773aa763ac6688fadd 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorTofPulser.cxx
@@ -1848,7 +1848,6 @@ void CbmMcbm2018MonitorTofPulser::UpdateNormedDnlInl()
   TDirectory* oldDir = gDirectory;
 
   gROOT->cd();
-  UInt_t uHistoFeeIdx = 0;
   TF1* constantVal    = new TF1("constant", "1", 0, gdpbv100::kdFtBinsNb);
   for (UInt_t uFeeNrInSys = 0; uFeeNrInSys < fuNrOfFeePerGdpb * fuNrOfGdpbs; uFeeNrInSys++) {
     fhFeeFtNormDnl[uFeeNrInSys]->Reset();
diff --git a/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
index 0e97224ad02e4663d0ce9e5f7bcc196883bc652f..b800268ee77488871f01a2f109b1226c99fe2514 100644
--- a/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmSpillFindAlgo.cxx
@@ -427,7 +427,7 @@ Bool_t CbmMcbmSpillFindAlgo::CreateHistograms()
   uint32_t iNbBinsLog = 0;
   /// Parameters are NbDecadesLog, NbStepsDecade, NbSubStepsInStep
   std::vector<double> dBinsLogVector = GenerateLogBinArray(4, 9, 1, iNbBinsLog);
-  double* dBinsLog                   = dBinsLogVector.data();
+  //double* dBinsLog                   = dBinsLogVector.data();
   //   double * dBinsLog = GenerateLogBinArray( 4, 9, 1, iNbBinsLog );
 
   /*******************************************************************/
@@ -450,8 +450,8 @@ Bool_t CbmMcbmSpillFindAlgo::CreateHistograms()
   /*******************************************************************/
 
   /// Canvases
-  Double_t w = 10;
-  Double_t h = 10;
+  //  Double_t w = 10;
+  //  Double_t h = 10;
 
   /*******************************************************************/
   /*
diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index 2919b5f44514a9af9a0eadf08db155bc3bd5adef..2a2d4292d5d109b9edf1237cb92ae792eadb95d2 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -1232,7 +1232,7 @@ void CbmL1::Reconstruct(CbmEvent* event)
   std::sort(SortStsHits.begin(), SortStsHits.end());
   StsIndex.resize(0);
 
-  for (int i = 0; i < SortStsHits.size(); i++) {
+  for (unsigned int i = 0; i < SortStsHits.size(); i++) {
     int j = SortStsHits[i].second;
     StsIndex.push_back(j);
   };
@@ -1484,7 +1484,7 @@ void CbmL1::Reconstruct(CbmEvent* event)
       bool isInOverlap = 0;
 
 
-      for (int i = 0; i < StsHitsLocal.size(); i++) {
+      for (unsigned int i = 0; i < StsHitsLocal.size(); i++) {
         //      if ((*ih) > int(vStsHits.size() - 1)) {
         //         indd = 1;
         //         break;
@@ -1563,9 +1563,9 @@ void CbmL1::Reconstruct(CbmEvent* event)
   //     ReadSTAPPerfData();
   //   };
 
-  for (int iTrack = 0; iTrack < vRTracksCur.size(); iTrack++) {
+  for (unsigned int iTrack = 0; iTrack < vRTracksCur.size(); iTrack++) {
 
-    for (int iHit = 0; iHit < vRTracksCur[iTrack].StsHits.size(); iHit++)
+    for (unsigned int iHit = 0; iHit < vRTracksCur[iTrack].StsHits.size(); iHit++)
       if (fTimesliceMode) vRTracksCur[iTrack].StsHits[iHit] = SortedIndex[vRTracksCur[iTrack].StsHits[iHit]];
 
     vRTracks.push_back(vRTracksCur[iTrack]);
diff --git a/reco/L1/CbmL1ReadEvent.cxx b/reco/L1/CbmL1ReadEvent.cxx
index f2411dac8b18f2da562eca7cea3e4cc6c419c6c8..f6d80d31f843d6f1ed7ea7656f9d1b0e75cbdd84 100644
--- a/reco/L1/CbmL1ReadEvent.cxx
+++ b/reco/L1/CbmL1ReadEvent.cxx
@@ -78,7 +78,7 @@ struct TmpHit {  // used for sort Hits before writing in the normal arrays
 };
 
 /// Repack data from Clones Arrays to L1 arrays
-void CbmL1::ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength, float& TsOverlap, int& FstHitinTs,
+void CbmL1::ReadEvent(L1AlgoInputData* fData_, float& TsStart, float& TsLength, float& /*TsOverlap*/, int& FstHitinTs,
                       bool& newTS, CbmEvent* event)
 {
   if (fVerbose >= 10) cout << "ReadEvent: start." << endl;