diff --git a/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx b/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
index 16dc585bbf3c42396adb06e54696f77090457bfb..73246290c11bfb76b86224f6346dd523d7a43fc3 100644
--- a/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
+++ b/analysis/PWGHAD/hadron/CbmHadronAnalysis.cxx
@@ -1330,7 +1330,7 @@ void CbmHadronAnalysis::Exec(Option_t* option)
       fTofHits->Clear();
       Int_t iNbHits = 0;
       LOG(debug) << "Fill Tof array with mul " << tEvent->GetNofData(ECbmDataType::kTofHit);
-      for (Int_t iHit = 0; iHit < tEvent->GetNofData(ECbmDataType::kTofHit); iHit++) {
+      for (size_t iHit = 0; iHit < tEvent->GetNofData(ECbmDataType::kTofHit); iHit++) {
         Int_t iHitIndex = static_cast<Int_t>(tEvent->GetIndex(ECbmDataType::kTofHit, iHit));
         CbmTofHit* pHit = (CbmTofHit*) fTofHitsColl->At(iHitIndex);
         new ((*fTofHits)[iNbHits]) CbmTofHit(*pHit);  // fill temporary working TClonesArray
@@ -1341,7 +1341,7 @@ void CbmHadronAnalysis::Exec(Option_t* option)
       fStsHits->Clear();
       LOG(debug) << "Fill Sts array with mul " << tEvent->GetNofData(ECbmDataType::kStsHit) << " out of "
                  << fStsHitsColl->GetEntriesFast();
-      for (Int_t iHit = 0; iHit < tEvent->GetNofData(ECbmDataType::kStsHit); iHit++) {
+      for (size_t iHit = 0; iHit < tEvent->GetNofData(ECbmDataType::kStsHit); iHit++) {
         Int_t iHitIndex       = static_cast<Int_t>(tEvent->GetIndex(ECbmDataType::kStsHit, iHit));
         const CbmStsHit* pHit = (CbmStsHit*) fStsHitsColl->At(iHitIndex);
         new ((*fStsHits)[iNbHits]) CbmStsHit(*pHit);  // fill temporary working TClonesArray
diff --git a/fles/mcbm2018/tasks/CbmCheckEvents.cxx b/fles/mcbm2018/tasks/CbmCheckEvents.cxx
index b00099bd38b26415276c07d826f01793efb605bf..4d1f8c4b68415ba9390e5859aea87e4a68aeb4ae 100644
--- a/fles/mcbm2018/tasks/CbmCheckEvents.cxx
+++ b/fles/mcbm2018/tasks/CbmCheckEvents.cxx
@@ -23,9 +23,9 @@
 #include "TProfile.h"
 #include <TDirectory.h>
 #include <TFile.h>
-#include <typeinfo>
 
 #include <iomanip>
+#include <typeinfo>
 
 using std::fixed;
 using std::setprecision;
@@ -80,7 +80,8 @@ InitStatus CbmCheckEvents::Init()
 
     if (nullptr != (ioman->GetObject("CbmEvent"))) {
       LOG(error) << "Got pointer of type" << typeid(ioman->GetObject("CbmEvent")).name();
-      LOG(error) << "Got Object of type" << typeid(*(ioman->GetObject("CbmEvent"))).name();
+      auto& tmp = *(ioman->GetObject("CbmEvent"));
+      LOG(error) << "Got Object of type" << typeid(tmp).name();
     }  // if( nullptr != (ioman->GetObject("CbmEvent") )
     LOG(fatal) << "No TClonesArray with events found.";
   }  // if (nullptr == fEvents)
diff --git a/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx b/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
index f745a308bb70ecfacd8c85affdbe1e95628eff57..c5f6c082eeba534a43893120f79d195d8e8fa45e 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2018EventBuilder.cxx
@@ -302,47 +302,47 @@ Bool_t CbmMcbm2018EventBuilder::HasTrigger(CbmEvent* event)
 {
   Bool_t hasTrigger {kTRUE};
   if (hasTrigger && (fT0DigiVec || fT0DigiArr) && fTriggerMinT0Digis > 0) {
-    hasTrigger = hasTrigger && (event->GetNofData(ECbmDataType::kT0Digi) >= fTriggerMinT0Digis);
+    hasTrigger = hasTrigger && ((int) event->GetNofData(ECbmDataType::kT0Digi) >= fTriggerMinT0Digis);
   }
   if (hasTrigger && fDigiMan->IsPresent(ECbmModuleId::kSts) && fTriggerMinStsDigis > 0) {
-    hasTrigger = hasTrigger && (event->GetNofData(ECbmDataType::kStsDigi) >= fTriggerMinStsDigis);
+    hasTrigger = hasTrigger && ((int) event->GetNofData(ECbmDataType::kStsDigi) >= fTriggerMinStsDigis);
   }
   if (hasTrigger && fDigiMan->IsPresent(ECbmModuleId::kMuch) && fTriggerMinMuchDigis > 0) {
-    hasTrigger = hasTrigger && (event->GetNofData(ECbmDataType::kMuchDigi) >= fTriggerMinMuchDigis);
+    hasTrigger = hasTrigger && ((int) event->GetNofData(ECbmDataType::kMuchDigi) >= fTriggerMinMuchDigis);
   }
   if (hasTrigger && fDigiMan->IsPresent(ECbmModuleId::kTrd) && fTriggerMinTrdDigis > 0) {
-    hasTrigger = hasTrigger && (event->GetNofData(ECbmDataType::kTrdDigi) >= fTriggerMinTrdDigis);
+    hasTrigger = hasTrigger && ((int) event->GetNofData(ECbmDataType::kTrdDigi) >= fTriggerMinTrdDigis);
   }
   if (hasTrigger && fDigiMan->IsPresent(ECbmModuleId::kTof) && fTriggerMinTofDigis > 0) {
-    hasTrigger = hasTrigger && (event->GetNofData(ECbmDataType::kTofDigi) >= fTriggerMinTofDigis);
+    hasTrigger = hasTrigger && ((int) event->GetNofData(ECbmDataType::kTofDigi) >= fTriggerMinTofDigis);
   }
   if (hasTrigger && fDigiMan->IsPresent(ECbmModuleId::kRich) && fTriggerMinRichDigis > 0) {
-    hasTrigger = hasTrigger && (event->GetNofData(ECbmDataType::kRichDigi) >= fTriggerMinRichDigis);
+    hasTrigger = hasTrigger && ((int) event->GetNofData(ECbmDataType::kRichDigi) >= fTriggerMinRichDigis);
   }
   if (hasTrigger && fDigiMan->IsPresent(ECbmModuleId::kPsd) && fTriggerMinPsdDigis > 0) {
-    hasTrigger = hasTrigger && (event->GetNofData(ECbmDataType::kPsdDigi) >= fTriggerMinPsdDigis);
+    hasTrigger = hasTrigger && ((int) event->GetNofData(ECbmDataType::kPsdDigi) >= fTriggerMinPsdDigis);
   }
 
   if (hasTrigger && (fT0DigiVec || fT0DigiArr) && fTriggerMaxT0Digis >= 0) {
-    hasTrigger = hasTrigger && (event->GetNofData(ECbmDataType::kT0Digi) < fTriggerMaxT0Digis);
+    hasTrigger = hasTrigger && ((int) event->GetNofData(ECbmDataType::kT0Digi) < fTriggerMaxT0Digis);
   }
   if (hasTrigger && fDigiMan->IsPresent(ECbmModuleId::kSts) && fTriggerMaxStsDigis >= 0) {
-    hasTrigger = hasTrigger && (event->GetNofData(ECbmDataType::kStsDigi) < fTriggerMaxStsDigis);
+    hasTrigger = hasTrigger && ((int) event->GetNofData(ECbmDataType::kStsDigi) < fTriggerMaxStsDigis);
   }
   if (hasTrigger && fDigiMan->IsPresent(ECbmModuleId::kMuch) && fTriggerMaxMuchDigis >= 0) {
-    hasTrigger = hasTrigger && (event->GetNofData(ECbmDataType::kMuchDigi) < fTriggerMaxMuchDigis);
+    hasTrigger = hasTrigger && ((int) event->GetNofData(ECbmDataType::kMuchDigi) < fTriggerMaxMuchDigis);
   }
   if (hasTrigger && fDigiMan->IsPresent(ECbmModuleId::kTrd) && fTriggerMaxTrdDigis >= 0) {
-    hasTrigger = hasTrigger && (event->GetNofData(ECbmDataType::kTrdDigi) < fTriggerMaxTrdDigis);
+    hasTrigger = hasTrigger && ((int) event->GetNofData(ECbmDataType::kTrdDigi) < fTriggerMaxTrdDigis);
   }
   if (hasTrigger && fDigiMan->IsPresent(ECbmModuleId::kTof) && fTriggerMaxTofDigis >= 0) {
-    hasTrigger = hasTrigger && (event->GetNofData(ECbmDataType::kTofDigi) < fTriggerMaxTofDigis);
+    hasTrigger = hasTrigger && ((int) event->GetNofData(ECbmDataType::kTofDigi) < fTriggerMaxTofDigis);
   }
   if (hasTrigger && fDigiMan->IsPresent(ECbmModuleId::kRich) && fTriggerMaxRichDigis >= 0) {
-    hasTrigger = hasTrigger && (event->GetNofData(ECbmDataType::kRichDigi) < fTriggerMaxRichDigis);
+    hasTrigger = hasTrigger && ((int) event->GetNofData(ECbmDataType::kRichDigi) < fTriggerMaxRichDigis);
   }
   if (hasTrigger && fDigiMan->IsPresent(ECbmModuleId::kPsd) && fTriggerMaxPsdDigis >= 0) {
-    hasTrigger = hasTrigger && (event->GetNofData(ECbmDataType::kPsdDigi) < fTriggerMaxPsdDigis);
+    hasTrigger = hasTrigger && ((int) event->GetNofData(ECbmDataType::kPsdDigi) < fTriggerMaxPsdDigis);
   }
 
   return hasTrigger;
diff --git a/reco/qa/CbmRecoQa.cxx b/reco/qa/CbmRecoQa.cxx
index e4238537986a833e332feffca832c3ea0f98a13f..3c7206fb621d1de2b51a031a7e14aa2fcc92ab98 100644
--- a/reco/qa/CbmRecoQa.cxx
+++ b/reco/qa/CbmRecoQa.cxx
@@ -217,7 +217,6 @@ void CbmRecoQa::record(std::string decName, int decNum)
       for (int j = 0; j < nEnt; j++) {
 
         float bestWeight  = 0.f;
-        float totalWeight = 0.f;
         //        int iMCPoint = -1; (FU) unused
         CbmLink link;
 
@@ -254,7 +253,6 @@ void CbmRecoQa::record(std::string decName, int decNum)
 
           for (int iLink = 0; iLink < curr_match.GetNofLinks(); iLink++) {
             float tmpweight = curr_match.GetLink(iLink).GetWeight();
-            totalWeight += tmpweight;
             //LOG(info) << " Match Link Nr.: " << iLink;
             if (tmpweight > bestWeight) {
               bestWeight = tmpweight;
@@ -314,8 +312,6 @@ void CbmRecoQa::record(std::string decName, int decNum)
       if (verbosity > 2) LOG(info) << "CbmRecoQa for " << decName << " found " << nEnt << " Hit Entries";
       for (int j = 0; j < nEnt; j++) {
 
-        //        float bestWeight = 0.f;
-        //        float totalWeight = 0.f;
         int iMC = -1;
 
         CbmMvdHit* curr_hit     = dynamic_cast<CbmMvdHit*>(listHits->At(j));
@@ -369,7 +365,6 @@ void CbmRecoQa::record(std::string decName, int decNum)
       for (int j = 0; j < nEnt; j++) {
 
         float bestWeight  = 0.f;
-        float totalWeight = 0.f;
         int iMC           = -1;
         CbmLink link;
 
@@ -378,7 +373,6 @@ void CbmRecoQa::record(std::string decName, int decNum)
 
         for (int iLink = 0; iLink < curr_match->GetNofLinks(); iLink++) {
           float tmpweight = curr_match->GetLink(iLink).GetWeight();
-          totalWeight += tmpweight;
           //LOG(info) << " Match Link Nr.: " << iLink;
           if (tmpweight > bestWeight) {
             bestWeight = tmpweight;