diff --git a/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx b/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
index eb250a654f340707be9fa5f011f2dd3a6a347d92..e688c7e10701e34f84284d7727365342eb5e50ca 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
+++ b/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
@@ -454,11 +454,7 @@ void CbmTofUnpackAlgo::ProcessHit(const critof001::Message& mess)
     return;  // Hit not mapped to digi
   }
 
-  /// Apply offset to T0 only to TOF digis
-  if (0x90 != fuCurrentMsSysId) {
-    /// Tricking clang to avoid one liner
-    dHitTime -= fSystemTimeOffset;
-  }
+  dHitTime -= fSystemTimeOffset;
 
   if (fbEpochCountHack2021) {
     /// FIXME: seems there is an offset of +4 Epoch between data and header
diff --git a/reco/detectors/tof/unpack/CbmTofUnpackMonitor.cxx b/reco/detectors/tof/unpack/CbmTofUnpackMonitor.cxx
index a2879d9faaf8e66206448e70b280dd53bb4fdc9b..3e8d15ab090542e3a4d4956826506183486afb55 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackMonitor.cxx
+++ b/reco/detectors/tof/unpack/CbmTofUnpackMonitor.cxx
@@ -920,7 +920,7 @@ void CbmTofUnpackMonitor::DrawBmonCanvases()
     fvhBmonChannelMapSpill[uSpill]->Draw();
     gPad->Update();
     TPaveStats* st = (TPaveStats*) fvhBmonChannelMapSpill[uSpill]->FindObject("stats");
-    st->SetOptStat(10);
+    st->SetOptStat(110);
     st->SetX1NDC(0.25);
     st->SetX2NDC(0.95);
     st->SetY1NDC(0.90);
diff --git a/reco/detectors/tof/unpack/CbmTofUnpackMonitor.h b/reco/detectors/tof/unpack/CbmTofUnpackMonitor.h
index 5039f6dadd745edad903e1bc02b8d8c1ab8b376d..69372384ff04fca7bab402b9a2bc14e0477b0a55 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackMonitor.h
+++ b/reco/detectors/tof/unpack/CbmTofUnpackMonitor.h
@@ -154,7 +154,7 @@ private:
   /// Map from electronics channel to BMon strip
   /// 2022 mapping: Y[0-3] on c0, Y[4-7] on c1, X[0-3] on c2, X[4-7] on c3
   /// Y not cabled for diamond but pulser there
-  UInt_t fuBmonChanMap[kuNbChanBmon] = {8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7};
+  UInt_t fuBmonChanMap[kuNbChanBmon] = {8, 9, 10, 11, 12, 13, 14, 15, 4, 5, 6, 7, 0, 1, 2, 3};
 
   /// MS size histograms
   TH1* fvhMsSize[kuMaxNbFlibLinks];