diff --git a/algo/detectors/rich/Unpack.cxx b/algo/detectors/rich/Unpack.cxx
index 684edd3704af546e40618a7c5a196d7de1ef92a0..c2b60505fb8137f4949181ac21b790df0f7f8498 100644
--- a/algo/detectors/rich/Unpack.cxx
+++ b/algo/detectors/rich/Unpack.cxx
@@ -88,7 +88,7 @@ namespace cbm::algo::rich
     size_t totalSize       = 0;
     ctx.currentSubSubEvent = 0;
 
-    uint32_t subSubEventId, subSubEventSize;
+    uint32_t subSubEventId = 0, subSubEventSize = 0;
 
     //loop over events in hub block
     while (totalSize < hubSize) {
diff --git a/algo/detectors/tof/Clusterizer.cxx b/algo/detectors/tof/Clusterizer.cxx
index c244d4ff1e6a82c7097609c933217bb93e4c6344..caf6d34f758dcc976f9c70358f1c133605f1bbf6 100644
--- a/algo/detectors/tof/Clusterizer.cxx
+++ b/algo/detectors/tof/Clusterizer.cxx
@@ -68,11 +68,11 @@ namespace cbm::algo::tof
 
     //Store last position in input channels to avoid unnecessary checks in AddNextChan().
     std::vector<inputType::iterator> lastChanPos;
-    for (int32_t chan = 0; chan < numChan; chan++) {
+    for (size_t chan = 0; chan < numChan; chan++) {
       lastChanPos.push_back(input[chan].begin());
     }
 
-    for (int32_t chan = 0; chan < numChan; chan++) {
+    for (int32_t chan = 0; (size_t) chan < numChan; chan++) {
 
       // Set partition vectors
       chanSizes.push_back(clustersOut.size());
@@ -204,11 +204,11 @@ namespace cbm::algo::tof
 
     while (fParams.fDeadStrips & (1 << chan)) {
       chan++;
-      if (chan >= numChan) {
+      if ((size_t) chan >= numChan) {
         return false;
       }
     }
-    if (chan == numChan) {
+    if ((size_t) chan == numChan) {
       return false;
     }
 
diff --git a/reco/tasks/CbmTaskTofClusterizer.cxx b/reco/tasks/CbmTaskTofClusterizer.cxx
index 4f0523bebf029519b8b349f62be9fb5803f5fdcb..a494de46294289f3898ea43e90eb8e26cdf9d0b8 100644
--- a/reco/tasks/CbmTaskTofClusterizer.cxx
+++ b/reco/tasks/CbmTaskTofClusterizer.cxx
@@ -93,7 +93,7 @@ void CbmTaskTofClusterizer::Exec(Option_t* option)
       LOG(debug) << "TS event " << iEvent << " with " << tEvent->GetNofData(ECbmDataType::kBmonDigi) << " Bmon and "
                  << tEvent->GetNofData(ECbmDataType::kTofDigi) << " Tof digis ";
 
-      for (int32_t iDigi = 0; iDigi < tEvent->GetNofData(ECbmDataType::kBmonDigi); iDigi++) {
+      for (size_t iDigi = 0; iDigi < tEvent->GetNofData(ECbmDataType::kBmonDigi); iDigi++) {
         int32_t iDigiIndex = static_cast<int32_t>(tEvent->GetIndex(ECbmDataType::kBmonDigi, iDigi));
         CbmTofDigi tDigi(fDigiMan->Get<CbmBmonDigi>(iDigiIndex));
         if (tDigi.GetType() != 5) {
@@ -104,13 +104,13 @@ void CbmTaskTofClusterizer::Exec(Option_t* option)
         }
         fTofDigiVec.push_back(tDigi);
       }
-      for (int32_t iDigi = 0; iDigi < tEvent->GetNofData(ECbmDataType::kTofDigi); iDigi++) {
+      for (size_t iDigi = 0; iDigi < tEvent->GetNofData(ECbmDataType::kTofDigi); iDigi++) {
         int32_t iDigiIndex      = static_cast<int32_t>(tEvent->GetIndex(ECbmDataType::kTofDigi, iDigi));
         const CbmTofDigi* tDigi = fDigiMan->Get<CbmTofDigi>(iDigiIndex);
         fTofDigiVec.push_back(CbmTofDigi(*tDigi));
       }
 
-      ExecEvent(option, tEvent);
+      ExecEvent(option);
 
       // --- In event-by-event mode: copy caldigis, hits and matches to output array and register them to event
       uint uDigi0 = fTofCalDigiVecOut->size();  //starting index of current event
@@ -197,7 +197,7 @@ void CbmTaskTofClusterizer::Exec(Option_t* option)
   }
 }
 
-void CbmTaskTofClusterizer::ExecEvent(Option_t* /*option*/, CbmEvent* tEvent)
+void CbmTaskTofClusterizer::ExecEvent(Option_t* /*option*/)
 {
   // Clear output arrays
   fTofCalDigiVec->clear();
@@ -337,7 +337,7 @@ bool CbmTaskTofClusterizer::BuildClusters()
 
   if (bAddBeamCounterSideDigi) {
     // Duplicate type "5" - digis
-    for (int32_t iDigInd = 0; iDigInd < fTofDigiVec.size(); iDigInd++) {
+    for (size_t iDigInd = 0; iDigInd < fTofDigiVec.size(); iDigInd++) {
       CbmTofDigi* pDigi = &(fTofDigiVec.at(iDigInd));
       if (pDigi->GetType() == 5) {  // || pDigi->GetType() == 8) {
         if (pDigi->GetSide() == 1) {
@@ -378,7 +378,7 @@ bool CbmTaskTofClusterizer::BuildClusters()
     //if (event) event->AddData(ECbmDataType::kTofHit, hitIndex);
 
     CbmMatch* digiMatch = new ((*fTofDigiMatchColl)[hitIndex]) CbmMatch();
-    for (uint32_t i = 0; i < cluster.numChan() * 2; i++) {
+    for (int32_t i = 0; i < cluster.numChan() * 2; i++) {
       size_t digiInd = indices.at(indexOffset + i);
       double tot     = fTofCalDigiVec->at(digiInd).GetTot();
       digiMatch->AddLink(CbmLink(tot, digiInd, fiOutputTreeEntry, fiFileIndex));
diff --git a/reco/tasks/CbmTaskTofClusterizer.h b/reco/tasks/CbmTaskTofClusterizer.h
index a9adfaea0abdaeec982644d2f2ff7aa501279362..9283cc50087876bc48c665bbf1b837a284d4dc1d 100644
--- a/reco/tasks/CbmTaskTofClusterizer.h
+++ b/reco/tasks/CbmTaskTofClusterizer.h
@@ -61,7 +61,7 @@ class CbmTaskTofClusterizer : public FairTask {
        ** @brief Inherited from FairTask.
        **/
   virtual void Exec(Option_t* option);
-  virtual void ExecEvent(Option_t* option, CbmEvent* tEvent = NULL);
+  virtual void ExecEvent(Option_t* option);
 
   /**
        ** @brief Inherited from FairTask.
@@ -70,18 +70,18 @@ class CbmTaskTofClusterizer : public FairTask {
   virtual void Finish(double calMode);
 
   ///////////// Empty functions for interface compatibility
-  inline void SetCalMode(int32_t iMode) {}
-  inline void SetDutId(int32_t Id) {}
-  inline void PosYMaxScal(double val) {}
-  inline void SetTotMax(double val) {}
-  inline void SetTotMin(double val) {}
-  inline void SetTotMean(double val) {}
-  inline void SetMaxTimeDist(double val) {}
-  inline void SetChannelDeadtime(double val) {}
-  inline void SetCalParFileName(TString CalParFileName) {}
-  inline double GetTotMean() { return 0.0; }
+  void SetCalMode(int32_t /*iMode*/) {}
+  void SetDutId(int32_t /*Id*/) {}
+  void PosYMaxScal(double /*val*/) {}
+  void SetTotMax(double /*val*/) {}
+  void SetTotMin(double /*val*/) {}
+  void SetTotMean(double /*val*/) {}
+  void SetMaxTimeDist(double /*val*/) {}
+  void SetChannelDeadtime(double /*val*/) {}
+  void SetCalParFileName(TString /*CalParFileName*/) {}
+  double GetTotMean() { return 0.0; }
   ////////////
-  inline int GetNbHits() { return fiNbHits; }
+  int GetNbHits() { return fiNbHits; }
 
   void SwapChannelSides(bool bSwap) { fbSwapChannelSides = bSwap; }
   void SetFileIndex(int32_t iIndex) { fiFileIndex = iIndex; }
diff --git a/reco/tasks/CbmTaskTofClusterizerParWrite.cxx b/reco/tasks/CbmTaskTofClusterizerParWrite.cxx
index 086fab63f82298fa7af7a021031451068042b17d..8c604fd248da6a1823a7d461561d5f2e27c51439 100644
--- a/reco/tasks/CbmTaskTofClusterizerParWrite.cxx
+++ b/reco/tasks/CbmTaskTofClusterizerParWrite.cxx
@@ -47,7 +47,7 @@ CbmTaskTofClusterizerParWrite::CbmTaskTofClusterizerParWrite()
 {
 }
 
-CbmTaskTofClusterizerParWrite::CbmTaskTofClusterizerParWrite(const char* name, int32_t verbose, bool writeDataInOut)
+CbmTaskTofClusterizerParWrite::CbmTaskTofClusterizerParWrite(const char* name, int32_t verbose, bool /*writeDataInOut*/)
   : FairTask(TString(name), verbose)
   , fTofId(NULL)
   , fDigiPar(NULL)
diff --git a/reco/tasks/CbmTaskTofClusterizerParWrite.h b/reco/tasks/CbmTaskTofClusterizerParWrite.h
index 1dc21f5c551b1aded1331e8ef8db0eacb2a1e5c1..80fe8bf0d713fab8b02982d1bbbea1ff89db8031 100644
--- a/reco/tasks/CbmTaskTofClusterizerParWrite.h
+++ b/reco/tasks/CbmTaskTofClusterizerParWrite.h
@@ -57,7 +57,7 @@ class CbmTaskTofClusterizerParWrite : public FairTask {
   /**
        ** @brief Inherited from FairTask.
        **/
-  virtual void Exec(Option_t* option){};
+  virtual void Exec(Option_t* /*option*/){};
 
   /**
        ** @brief Inherited from FairTask.