diff --git a/macro/run/create_mcbm_geo_setup.C b/macro/run/create_mcbm_geo_setup.C
index 1b5a95c1c12a284762a82b2489a3d8aa4233d6d8..369ba842f3347fb193e4f458987485798ddeb515 100644
--- a/macro/run/create_mcbm_geo_setup.C
+++ b/macro/run/create_mcbm_geo_setup.C
@@ -2,7 +2,7 @@
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Pierre-Alain Loizeau [committer]  */
 
-void create_mcbm_geo_setup(uint64_t ulRunId)
+void create_mcbm_geo_setup(uint64_t ulRunId, const std::string& sOutputDir = "data/")
 {
   /// Do automatic mapping
   std::string sSetupName = "";
@@ -14,7 +14,7 @@ void create_mcbm_geo_setup(uint64_t ulRunId)
     std::cout << "Error in mapping from runID to setup name: " << e.what() << std::endl;
     return;
   }
-  std::string sPath = "data/" + sSetupName;
+  std::string sPath = sOutputDir + "/" + sSetupName;
   if (gSystem->AccessPathName(Form("%s.geo.root", sPath.data()))) {
     std::string sSrcDir         = gSystem->Getenv("VMCWORKDIR");  // top source directory
     std::string sTransportMacro = sSrcDir + "/macro/mcbm/mcbm_transport.C";
diff --git a/reco/L1/CbmL1ReadEvent.cxx b/reco/L1/CbmL1ReadEvent.cxx
index c77594bf4de923baae810d7d9e3ddda7d48b96a0..91bf7632e409b3f22a7f1326316f2237ff478490 100644
--- a/reco/L1/CbmL1ReadEvent.cxx
+++ b/reco/L1/CbmL1ReadEvent.cxx
@@ -900,7 +900,7 @@ void CbmL1::ReadEvent(float& TsStart, float& TsLength, float& /*TsOverlap*/, int
         th.iStation = stIdx;  //h->GetStationNr() - 1;
 
         //Get time
-        th.time = h->GetTime() - 14.5;
+        th.time = h->GetTime();
         th.dt   = h->GetTimeError();