diff --git a/core/data/tof/CbmTofDetectorId_v21a.cxx b/core/data/tof/CbmTofDetectorId_v21a.cxx
index 78f9372086f9d4c2389fe52ac1926e6f90f68c6f..4a60a162d80b588e297f52708e35295fd94fd67e 100644
--- a/core/data/tof/CbmTofDetectorId_v21a.cxx
+++ b/core/data/tof/CbmTofDetectorId_v21a.cxx
@@ -26,7 +26,7 @@ CbmTofDetectorId_v21a::CbmTofDetectorId_v21a()
     if (i == 4) continue;  // ignore side bit
     modulemask |= (maskarray[i] << shiftarray[i]);
   }
-  char prev = std::cout.fill('x');
+  char prev = std::cout.fill();
   std::cout << "<I> V21a module mask 0x" << std::setfill('0') << std::setw(8)
             << std::right << std::hex << modulemask << std::setfill(prev)
             << std::dec << std::endl;
diff --git a/macro/beamtime/mcbm2020/CMakeLists.txt b/macro/beamtime/mcbm2020/CMakeLists.txt
index 83e09cfc10d3714f5869310d386ef510e757657a..79b3b909bb58bbe73b42a051774220e1504d2748 100644
--- a/macro/beamtime/mcbm2020/CMakeLists.txt
+++ b/macro/beamtime/mcbm2020/CMakeLists.txt
@@ -146,8 +146,8 @@ If(DEFINED ENV{RAW_DATA_PATH} )
       Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/mcbm2020/mcbm_event_ana.sh ${RUN} 1000 "kTRUE" )
       Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600")
       Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-      set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_mcbm_build_reco_${RUN}})
-      set_tests_properties(${testname} PROPERTIES DEPENDS mcbm_build_reco_2020_${RUN})
+      set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_mcbm_track_evt_win_${RUN}})
+      set_tests_properties(${testname} PROPERTIES DEPENDS mcbm_track_evt_win_2020_${RUN})
       Set(fixture_mcbm_evt_win_ana_${RUN} fixture_done_${testname})
       set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_mcbm_evt_win_ana_${RUN}})
 
@@ -155,8 +155,8 @@ If(DEFINED ENV{RAW_DATA_PATH} )
       Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/beamtime/mcbm2020/mcbm_event_ana.sh ${RUN} )
       Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600")
       Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-      set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_mcbm_event_reco_${RUN}})
-      set_tests_properties(${testname} PROPERTIES DEPENDS mcbm_event_reco_2020_${RUN})
+      set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_mcbm_track_event_${RUN}})
+      set_tests_properties(${testname} PROPERTIES DEPENDS mcbm_track_event_2020_${RUN})
       Set(fixture_mcbm_event_ana_${RUN} fixture_done_${testname})
       set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_mcbm_event_ana_${RUN}})
 
diff --git a/macro/beamtime/mcbm2020/mcbm_event_ana.C b/macro/beamtime/mcbm2020/mcbm_event_ana.C
index 7399cefef4ff41acb112cdb2462cd82f6ae9bf8f..b721048170a59489680188007826183f198b3576 100644
--- a/macro/beamtime/mcbm2020/mcbm_event_ana.C
+++ b/macro/beamtime/mcbm2020/mcbm_event_ana.C
@@ -23,9 +23,11 @@ void mcbm_event_ana(Int_t runId       = 831,
   // ------------------------------------------------------------------------
 
   // -----   In- and output file names   ------------------------------------
-  TString inFile = Form("./data/reco_mcbm_%03u.root", runId);
+  TString inFile  = Form("./data/reco_mcbm_event_%03u.root", runId);
+  TString trkFile = Form("./data/tracking_mcbm_event_%03u.root", runId);
   if (bUseEvtWin) {
     inFile = Form("./data/reco_mcbm_evt_win_%03u.root", runId);
+    trkFile = Form("./data/tracking_mcbm_evt_win_%03u.root", runId);
   }  // if (bUseEvtWin)
   TString parFile = Form("./data/unp_mcbm_params_%i.root", runId);
   TString geoFile = paramDir + "mcbm_beam_2020_03.geo.root";
@@ -47,6 +49,7 @@ void mcbm_event_ana(Int_t runId       = 831,
   // -----   FairRunAna   ---------------------------------------------------
   FairRunAna* run             = new FairRunAna();
   FairFileSource* inputSource = new FairFileSource(inFile);
+  inputSource->AddFriend(trkFile);
   run->SetSource(inputSource);
 
   FairRootFileSink* outputSink = new FairRootFileSink(outFile);