diff --git a/macro/beamtime/mcbm2022/mcbm_event.C b/macro/beamtime/mcbm2022/mcbm_event.C
index 122aa04331bc6546a0cce647cb0700a721f03618..85d565af27f9794931371dc6183388a38d6bd547 100644
--- a/macro/beamtime/mcbm2022/mcbm_event.C
+++ b/macro/beamtime/mcbm2022/mcbm_event.C
@@ -480,7 +480,10 @@ Bool_t mcbm_event(std::string infile,
   evBuildRaw->ChangeMuchBeamtimeDigiFlag();
 
   // Enable DigiEvent output if requested
-  if (bDigiEvtsOutput) evBuildRaw->SetDigiEventOutput();
+  if (bDigiEvtsOutput) {
+    evBuildRaw->SetDigiEventOutput();
+    evBuildRaw->SetDigiEventExclusiveTrdExtraction();
+  }
 
   evBuildRaw->SetOutFilename(histosfilename);
   // evBuildRaw->SetOutputBranchPersistent("CbmEvent", kFALSE);
diff --git a/macro/beamtime/mcbm2022/mcbm_reco.C b/macro/beamtime/mcbm2022/mcbm_reco.C
index 2e68005e6f40d16e3f177e7ad4734dba8bf7947d..394bdcb7c3adcfb4060b968d66a7c3a451db505a 100644
--- a/macro/beamtime/mcbm2022/mcbm_reco.C
+++ b/macro/beamtime/mcbm2022/mcbm_reco.C
@@ -544,13 +544,15 @@ Bool_t mcbm_reco(UInt_t uRunId                   = 2391,
     TString tofGeoTag;
     if (geoSetup->GetGeoTag(ECbmModuleId::kTof, tofGeoTag)) {
       TString parFile = gSystem->Getenv("VMCWORKDIR");
-      parFile         = parFile + "/parameters/tof/tof_matbudget_" + tofGeoTag + ".root ";
-      // parFile = parFile + "/parameters/tof/tof_matbudget_v21d_mcbm.root";
-      std::cout << "Using material budget file " << parFile << std::endl;
+      //parFile         = parFile + "/parameters/tof/tof_matbudget_" + tofGeoTag + ".root ";";
+      //std::cout << "Using material budget file " << parFile << std::endl;
+      // FIXME
+      parFile = parFile + "/parameters/tof/tof_matbudget_v21d_mcbm.root";
+      std::cout << "FIXME: Using material budget file tof_matbudget_v21d_mcbm as right one not in repo!!!" << std::endl;
       l1->SetTofMaterialBudgetFileName(parFile.Data());
     }
 
-
+    /// PAL, 08/02/2023: Is the following comment still valid with the current master?
     //   Workaround to get it running:
     //    1) Change fUseGlobal  in line 129 of CbmStsParSetModule.h to
     //         Bool_t fUseGlobal = kTRUE;