diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx
index dfb9d7ee05e7d46617d8fba9165b2769c427eadd..3ee44e81b8c733c1a7089adb683a6b2a668c46be 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmQaReal.cxx
@@ -776,15 +776,15 @@ void CbmRichMCbmQaReal::Exec(Option_t* /*option*/)
 
     //std::cout<<"NofT0Digis in TS: "<< fT0Digis->size() <<std::endl;
     Double_t minT0TimeDiff = std::numeric_limits<Double_t>::max();
-    Double_t T0Time        = std::numeric_limits<Double_t>::max();
-    for (auto j = 0; j < fT0Digis->size(); j++) {
+    //Double_t T0Time        = std::numeric_limits<Double_t>::max();
+    for (uint32_t j = 0; j < fT0Digis->size(); j++) {
       const CbmTofDigi* T0Digi = nullptr;
       if (fT0Digis) T0Digi = &(fT0Digis->at(j));
       assert(T0Digi);
       Double_t timeDiffT0 = T0Digi->GetTime() - fCbmEventStartTime;
       if (std::fabs(timeDiffT0) < std::fabs(minT0TimeDiff)) {
         minT0TimeDiff = timeDiffT0;
-        T0Time        = T0Digi->GetTime();
+        //T0Time        = T0Digi->GetTime();
       }
     }
     //std::cout<<"T0Digistime: "<< T0Time << "  EventStartTime:" << fCbmEventStartTime <<"   Time DIff: "<< minT0TimeDiff <<std::endl;
@@ -1361,7 +1361,7 @@ std::pair<int, double> CbmRichMCbmQaReal::FindClosestRing(CbmTofTracklet* track,
     const double xDist        = (x_track - ringX);
     const double yDist        = (y_track - ringY);
     const double rDist        = std::sqrt(xDist * xDist + yDist * yDist);
-    const double RadiusFactor = 1.2;  // Factor of how big radius of acceptance should
+    //const double RadiusFactor = 1.2;  // Factor of how big radius of acceptance should
 
     if (/*rDist < ring->GetRadius() * RadiusFactor &&*/ cutRadius(ring)) {
       //std::cout<<"Track in defined Ring range ("<<ring->GetRadius()*RadiusFactor<<"cm) (RingRadius: "<<ring->GetRadius()<<"cm).  ";
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.cxx b/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.cxx
index 9b9a89c23794e37ec99a0ffb74e729afae860072..d40f0c5abab4dd754144bb7cde53bb0e69e664f2 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.cxx
+++ b/reco/detectors/rich/unpack/CbmRichUnpackAlgo2022.cxx
@@ -263,10 +263,12 @@ void CbmRichUnpackAlgo2022::processTrbPacket(CbmRichUnpackAlgoMicrosliceReader&
   uint32_t trigNum_this = reader.NextWord() & 0xFFFFFF;
   reader.NextWord();  // reserved
 
+  uint32_t wordEpoch;  // Create variable out of 1st loop to trick the "unused variable" warning with 2nd loop use
+  uint32_t wordTime;   // Create variable out of 1st loop to trick the "unused variable" warning with 2nd loop use
   for (auto l = 0; l < 2; ++l) {
-    uint32_t wordEpoch = reader.NextWord();
+    wordEpoch = reader.NextWord();
     //uint32_t epoch     = CbmRichUnpackAlgoTdcWordReader::ProcessEpoch(wordEpoch);
-    uint32_t wordTime = reader.NextWord();
+    wordTime = reader.NextWord();
     //CbmRichUnpackAlgoTdcTimeData td;
     //CbmRichUnpackAlgoTdcWordReader::ProcessTimeData(wordTime, td);
 
@@ -281,12 +283,18 @@ void CbmRichUnpackAlgo2022::processTrbPacket(CbmRichUnpackAlgoMicrosliceReader&
 
   uint32_t trigNum_prevMes = reader.NextWord() & 0xFFFFFF;
 
+  if (false) {
+    // Following just for tricking the unused var warning detection without breaking the existing code
+    LOG(trace) << "trigNum_this =" << trigNum_this << " trigNum_prevMes = " << trigNum_prevMes
+               << " CbmTimePacket_prev = " << CbmTimePacket_prev;
+  }
+
   reader.NextWord();  // reserved
 
   for (auto l = 0; l < 14; ++l) {
-    uint32_t wordEpoch = reader.NextWord();
-    uint32_t epoch     = CbmRichUnpackAlgoTdcWordReader::ProcessEpoch(wordEpoch);
-    uint32_t wordTime  = reader.NextWord();
+    wordEpoch      = reader.NextWord();
+    uint32_t epoch = CbmRichUnpackAlgoTdcWordReader::ProcessEpoch(wordEpoch);
+    wordTime       = reader.NextWord();
     CbmRichUnpackAlgoTdcTimeData td;
     CbmRichUnpackAlgoTdcWordReader::ProcessTimeData(wordTime, td);