diff --git a/algo/detectors/t0/UnpackT0.cxx b/algo/detectors/t0/UnpackT0.cxx
index f8fc5a25d00a7b935c67f801f2add8e840308859..9ba037315772ef0fa0a02d4d08de6a6b543c8a32 100644
--- a/algo/detectors/t0/UnpackT0.cxx
+++ b/algo/detectors/t0/UnpackT0.cxx
@@ -81,11 +81,11 @@ namespace cbm::algo
           break;
         }
         case critof001::MSG_SLOWC: {
-          // Fill error
+          result.second.fNumNonHitOrTsbMessage++;
           break;
         }
         case critof001::MSG_SYST: {
-          // Fill error
+          result.second.fNumNonHitOrTsbMessage++;
           break;
         }
         default: {
diff --git a/algo/detectors/tof/TofReadoutConfig.cxx b/algo/detectors/tof/TofReadoutConfig.cxx
index 6b8eb5048ef28a52852cf73f37a3b609515751d8..76617736b4c9cbb89ef73fc184d46e9d3bccfa95 100644
--- a/algo/detectors/tof/TofReadoutConfig.cxx
+++ b/algo/detectors/tof/TofReadoutConfig.cxx
@@ -150,24 +150,28 @@ namespace cbm::algo
           BuildChannelsUidMapCera(uCh, uGbtx);
           break;
         }
-        case 69:
-        case 6:  // Buc box
-        {
-          BuildChannelsUidMapBuc(uCh, uGbtx);
-          if (rpcType[uGbtx] == 6) break;
-        }
-          [[fallthrough]];
         case 4:  // intended fallthrough
           [[fallthrough]];
         case 7: [[fallthrough]];
         case 9:  // Star2 boxes
         {
-          if (rpcType[uGbtx] == 69) uCh -= 80;
           BuildChannelsUidMapStar2(uCh, uGbtx);
-          if (rpcType[uGbtx] == 69) uCh -= 80;
           break;
         }
-
+        case 6:  // Buc box
+        {
+          BuildChannelsUidMapBuc(uCh, uGbtx);
+          break;
+        }
+        case 69: {
+          /// 2022 case: 69 is followed by 4 and 9
+          BuildChannelsUidMapBuc(uCh, uGbtx);
+          /// Map also 4 and 9 (equivalent to fallthrough to 4 then 9 but without changing past behaviors)
+          uCh -= 80;  // PAL, 2022/03/17: ?!?
+          BuildChannelsUidMapStar2(uCh, uGbtx);
+          uCh -= 80;  // PAL, 2022/03/17: ?!?
+          break;
+        }
         case -1: {
           LOG(info) << " Found unused GBTX link at uCh = " << uCh;
           uCh += 160;
diff --git a/algo/detectors/tof/UnpackTof.cxx b/algo/detectors/tof/UnpackTof.cxx
index 3875d303e156e3ab3141dff7b98f670e6ebf5914..03d182708fdda3e1d09e058e557cf741a5ec3b87 100644
--- a/algo/detectors/tof/UnpackTof.cxx
+++ b/algo/detectors/tof/UnpackTof.cxx
@@ -80,11 +80,11 @@ namespace cbm::algo
           break;
         }
         case critof001::MSG_SLOWC: {
-          // Fill error
+          result.second.fNumNonHitOrTsbMessage++;
           break;
         }
         case critof001::MSG_SYST: {
-          // Fill error
+          result.second.fNumNonHitOrTsbMessage++;
           break;
         }
         default: {