diff --git a/MQ/mcbm/CbmDeviceUnpack.cxx b/MQ/mcbm/CbmDeviceUnpack.cxx
index 09123c265f53e86de68769bbe020957a0c038968..7af5795bed8f9009a8dd837b7b37bc7dd5169325 100644
--- a/MQ/mcbm/CbmDeviceUnpack.cxx
+++ b/MQ/mcbm/CbmDeviceUnpack.cxx
@@ -322,15 +322,15 @@ Bool_t CbmDeviceUnpack::InitContainers()
       //trdfasp2dconfig->SetOutputBranchName("TrdFaspDigi");
       uint8_t map[NFASPMOD];
       uint16_t crob_map[NCROBMOD];
-      for (int i(0); i < NFASPMOD; i++)
+      for (uint32_t i(0); i < NFASPMOD; i++)
         map[i] = i;
       if (fuRunId <= 1588) {
         const size_t nfasps = 12;
         uint8_t map21[] = {9, 2, 3, 11, 10, 7, 8, 0, 1, 4, 6, 5};
-        for (int i(0); i < nfasps; i++)
+        for (uint32_t i(0); i < nfasps; i++)
           map[i] = map21[i];
         uint16_t crob_map21[] = {0x00f0, 0, 0, 0, 0};
-        for (int i(0); i < NCROBMOD; i++)
+        for (uint32_t i(0); i < NCROBMOD; i++)
           crob_map[i] = crob_map21[i];
       }
       else if (fuRunId >= 2335) {
@@ -344,10 +344,10 @@ Bool_t CbmDeviceUnpack::InitContainers()
           72,  73,  74,  75,  76,  77,   // FEB9/0xffc1
           78,  79,  80,  81,  82,  83    // FEB8/0xffc1
         };
-        for (int i(0); i < nfasps; i++)
+        for (uint32_t i(0); i < nfasps; i++)
           map[i + nfasp0] = map22[i];
         uint16_t crob_map22[] = {0xffc2, 0xffc5, 0xffc1, 0, 0};
-        for (int i(0); i < NCROBMOD; i++)
+        for (uint32_t i(0); i < NCROBMOD; i++)
           crob_map[i] = crob_map22[i];
       }
       trdfasp2dconfig->SetFaspMapping(5, map);
diff --git a/macro/run/run_unpack_online.C b/macro/run/run_unpack_online.C
index 5ddcb0235fb93fe1a279fae0bc08953658cb5b50..30b7132c7e81f8332ce33b5b549a4fc1ae11b610 100644
--- a/macro/run/run_unpack_online.C
+++ b/macro/run/run_unpack_online.C
@@ -315,15 +315,15 @@ void run_unpack_online(std::vector<std::string> publisher = {"tcp://localhost:55
     // trdfasp2dconfig->SetOutputBranchName("TrdFaspDigi");
     uint8_t map[NFASPMOD];
     uint16_t crob_map[NCROBMOD];
-    for (int i(0); i < NFASPMOD; i++)
+    for (uint32_t i(0); i < NFASPMOD; i++)
       map[i] = i;
     if (runid <= 1588) {
       const size_t nfasps = 12;
       uint8_t map21[] = {9, 2, 3, 11, 10, 7, 8, 0, 1, 4, 6, 5};
-      for (int i(0); i < nfasps; i++)
+      for (uint32_t i(0); i < nfasps; i++)
         map[i] = map21[i];
       uint16_t crob_map21[] = {0x00f0, 0, 0, 0, 0};
-      for (int i(0); i < NCROBMOD; i++)
+      for (uint32_t i(0); i < NCROBMOD; i++)
         crob_map[i] = crob_map21[i];
     }
     else if (runid >= 2335) {
@@ -337,10 +337,10 @@ void run_unpack_online(std::vector<std::string> publisher = {"tcp://localhost:55
         72,  73,  74,  75,  76,  77,   // FEB9/0xffc1
         78,  79,  80,  81,  82,  83    // FEB8/0xffc1
       };
-      for (int i(0); i < nfasps; i++)
+      for (uint32_t i(0); i < nfasps; i++)
         map[i + nfasp0] = map22[i];
       uint16_t crob_map22[] = {0xffc2, 0xffc5, 0xffc1, 0, 0};
-      for (int i(0); i < NCROBMOD; i++)
+      for (uint32_t i(0); i < NCROBMOD; i++)
         crob_map[i] = crob_map22[i];
     }
     trdfasp2dconfig->SetFaspMapping(5, map);
diff --git a/macro/run/run_unpack_tsa.C b/macro/run/run_unpack_tsa.C
index 6227f7cc187fc79f5f81426ace2a2d9fec0773e8..e40e54c22d894c01e6e38dc0ab9fc510ece69e4a 100644
--- a/macro/run/run_unpack_tsa.C
+++ b/macro/run/run_unpack_tsa.C
@@ -333,15 +333,15 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid
     // trdfasp2dconfig->SetOutputBranchName("TrdFaspDigi");
     uint8_t map[NFASPMOD];
     uint16_t crob_map[NCROBMOD];
-    for (int i(0); i < NFASPMOD; i++)
+    for (uint32_t i(0); i < NFASPMOD; i++)
       map[i] = i;
     if (runid <= 1588) {
       const size_t nfasps = 12;
       uint8_t map21[] = {9, 2, 3, 11, 10, 7, 8, 0, 1, 4, 6, 5};
-      for (int i(0); i < nfasps; i++)
+      for (uint32_t i(0); i < nfasps; i++)
         map[i] = map21[i];
       uint16_t crob_map21[] = {0x00f0, 0, 0, 0, 0};
-      for (int i(0); i < NCROBMOD; i++)
+      for (uint32_t i(0); i < NCROBMOD; i++)
         crob_map[i] = crob_map21[i];
     }
     else if (runid >= 2335) {
@@ -355,10 +355,10 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid
         72,  73,  74,  75,  76,  77,   // FEB9/0xffc1
         78,  79,  80,  81,  82,  83    // FEB8/0xffc1
       };
-      for (int i(0); i < nfasps; i++)
+      for (uint32_t i(0); i < nfasps; i++)
         map[i + nfasp0] = map22[i];
       uint16_t crob_map22[] = {0xffc2, 0xffc5, 0xffc1, 0, 0};
-      for (int i(0); i < NCROBMOD; i++)
+      for (uint32_t i(0); i < NCROBMOD; i++)
         crob_map[i] = crob_map22[i];
     }
     trdfasp2dconfig->SetFaspMapping(5, map);
diff --git a/reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx b/reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx
index a07e672ea3a74bed7d31ac524a77de2b004f2399..c21d67978c5ee0c480f10e3e4fe686a9f5a3a1b2 100644
--- a/reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx
+++ b/reco/detectors/much/unpack/CbmMuchUnpackAlgo.cxx
@@ -529,7 +529,7 @@ void CbmMuchUnpackAlgo::processHitInfo(const stsxyter::Message& mess)
 
       if (fMonitor) fMonitor->CountDigi(uAsicIdx, uChanInFeb);
       //Checking for Raw channel value
-      if (usChan > 127 || usChan < 0) LOG(debug) << "ERROR !!! Channel in hit message is out of range  " << usChan;
+      if (usChan > 127) LOG(debug) << "ERROR !!! Channel in hit message is out of range  " << usChan;
       // uFebIdx is FEB position in the GEM and RPC
       const uint32_t address = CreateMuchAddress(fuCurrDpbIdx, uFebIdx, usChan);
       //const uint32_t address = CreateMuchAddress(fuCurrDpbIdx, uFebIdx, uChanInFeb);