diff --git a/src/algorithms/tracking/CKFTracking.cc b/src/algorithms/tracking/CKFTracking.cc
index 371574de5..0f809fff0 100644
--- a/src/algorithms/tracking/CKFTracking.cc
+++ b/src/algorithms/tracking/CKFTracking.cc
@@ -336,6 +336,15 @@ namespace eicrecon {
 
         std::optional<unsigned int> lastSeed;
         for (const auto& track : constTracks) {
+#if Acts_VERSION_MAJOR >= 34
+          // Some B0 tracks fail to extrapolate to the perigee surface. The
+          // Acts::extrapolateTrackToReferenceSurface will not set
+          // referenceSurface in that case, which is what we check here.
+          if (not track.hasReferenceSurface()) {
+            m_log->warn("Skipping a track not on perigee surface");
+            continue;
+          }
+#endif
           if (!lastSeed) {
             lastSeed = constSeedNumber(track);
           }
diff --git a/src/benchmarks/reconstruction/tof_efficiency/TofEfficiency_processor.cc b/src/benchmarks/reconstruction/tof_efficiency/TofEfficiency_processor.cc
index 4bb2de872..ddc84fa38 100644
--- a/src/benchmarks/reconstruction/tof_efficiency/TofEfficiency_processor.cc
+++ b/src/benchmarks/reconstruction/tof_efficiency/TofEfficiency_processor.cc
@@ -60,7 +60,7 @@ void TofEfficiency_processor::InitWithGlobalRootLock(){
 void TofEfficiency_processor::ProcessSequential(const std::shared_ptr<const JEvent>& event) {
     const auto &mcParticles   = *(event->GetCollection<edm4hep::MCParticle>("MCParticles"));
     const auto &trackSegments = *(event->GetCollection<edm4eic::TrackSegment>("CentralTrackSegments"));
-    const auto &barrelHits    = *(event->GetCollection<edm4eic::TrackerHit>("TOFBarrelRecHit"));
+    const auto &barrelHits    = *(event->GetCollection<edm4eic::TrackerHit>("TOFBarrelRecHits"));
     const auto &endcapHits    = *(event->GetCollection<edm4eic::TrackerHit>("TOFEndcapRecHits"));
 
     // List TOF Barrel hits from barrel
diff --git a/src/detectors/BEMC/BEMC.cc b/src/detectors/BEMC/BEMC.cc
index 266512c6c..7e29d1ed7 100644
--- a/src/detectors/BEMC/BEMC.cc
+++ b/src/detectors/BEMC/BEMC.cc
@@ -68,7 +68,7 @@ extern "C" {
             .resolutionTDC = EcalBarrelScFi_resolutionTDC,
             .thresholdFactor = 0.0, // use only thresholdValue
             .thresholdValue = 5.0, // 16384 ADC counts/1500 MeV * 0.5 MeV (desired threshold) = 5.46
-            .sampFrac = "0.09320426",
+            .sampFrac = "0.09285755",
             .readout = "EcalBarrelScFiHits",
             .layerField = "layer",
             .sectorField = "sector",
@@ -150,7 +150,7 @@ extern "C" {
             .resolutionTDC = EcalBarrelImaging_resolutionTDC,
             .thresholdFactor = 0.0, // use only thresholdValue
             .thresholdValue = 41, // 8192 ADC counts/3 MeV * 0.015 MeV (desired threshold) = 41
-            .sampFrac = "0.00619766",
+            .sampFrac = "0.00429453",
             .readout = "EcalBarrelImagingHits",
             .layerField = "layer",
             .sectorField = "sector",
diff --git a/src/detectors/BTOF/BTOF.cc b/src/detectors/BTOF/BTOF.cc
index 1bb05e9bd..71e86826f 100644
--- a/src/detectors/BTOF/BTOF.cc
+++ b/src/detectors/BTOF/BTOF.cc
@@ -32,23 +32,31 @@ void InitPlugin(JApplication* app) {
 
   // Digitization
   app->Add(new JOmniFactoryGeneratorT<SiliconTrackerDigi_factory>(
-      "TOFBarrelRawHit", {"TOFBarrelHits"}, {"TOFBarrelRawHit", "TOFBarrelRawHitAssociations"},
+      "TOFBarrelRawHits",
       {
-          .threshold      = 6.0 * dd4hep::keV,
-          .timeResolution = 0.025, // [ns]
+        "TOFBarrelHits"
       },
-      app));
+      {
+        "TOFBarrelRawHits",
+        "TOFBarrelRawHitAssociations"
+      },
+      {
+        .threshold = 6.0 * dd4hep::keV,
+        .timeResolution = 0.025,    // [ns]
+      },
+      app
+  ));
 
-// Convert raw digitized hits into hits with geometry info (ready for tracking)
-      app->Add(new JOmniFactoryGeneratorT<TrackerHitReconstruction_factory>(
-        "TOFBarrelRecHit",
-        {"TOFBarrelRawHit"},    // Input data collection tags
-        {"TOFBarrelRecHit"},     // Output data tag
-        {
-            .timeResolution = 10,
-        },
-        app
-    ));         // Hit reco default config for factories
+  // Convert raw digitized hits into hits with geometry info (ready for tracking)
+  app->Add(new JOmniFactoryGeneratorT<TrackerHitReconstruction_factory>(
+      "TOFBarrelRecHits",
+      {"TOFBarrelRawHits"},    // Input data collection tags
+      {"TOFBarrelRecHits"},    // Output data tag
+      {
+          .timeResolution = 10,
+      },
+      app
+  ));         // Hit reco default config for factories
 
   app->Add(new JOmniFactoryGeneratorT<BTOFChargeSharing_factory>(
       "BTOFChargeSharing",
diff --git a/src/global/tracking/tracking.cc b/src/global/tracking/tracking.cc
index 7221bfa91..eeef3016e 100644
--- a/src/global/tracking/tracking.cc
+++ b/src/global/tracking/tracking.cc
@@ -50,7 +50,7 @@ void InitPlugin(JApplication *app) {
         {"SiBarrelHits", "SiBarrelRawHits", "SiBarrelRawHitAssociations", "SiBarrelTrackerRecHits"},
         {"VertexBarrelHits", "SiBarrelVertexRawHits", "SiBarrelVertexRawHitAssociations", "SiBarrelVertexRecHits"},
         {"TrackerEndcapHits", "SiEndcapTrackerRawHits", "SiEndcapTrackerRawHitAssociations", "SiEndcapTrackerRecHits"},
-        {"TOFBarrelHits", "TOFBarrelRawHits", "TOFBarrelRawHitAssociations", "TOFBarrelRecHit"},
+        {"TOFBarrelHits", "TOFBarrelRawHits", "TOFBarrelRawHitAssociations", "TOFBarrelRecHits"},
         {"TOFEndcapHits", "TOFEndcapRawHits", "TOFEndcapRawHitAssociations", "TOFEndcapRecHits"},
         {"MPGDBarrelHits", "MPGDBarrelRawHits", "MPGDBarrelRawHitAssociations", "MPGDBarrelRecHits"},
         {"OuterMPGDBarrelHits", "OuterMPGDBarrelRawHits", "OuterMPGDBarrelRawHitAssociations", "OuterMPGDBarrelRecHits"},
diff --git a/src/services/io/podio/JEventProcessorPODIO.cc b/src/services/io/podio/JEventProcessorPODIO.cc
index f510c3df5..2575c326a 100644
--- a/src/services/io/podio/JEventProcessorPODIO.cc
+++ b/src/services/io/podio/JEventProcessorPODIO.cc
@@ -85,10 +85,10 @@ JEventProcessorPODIO::JEventProcessorPODIO() {
             "SiEndcapTrackerRawHitAssociations",
 
             // TOF
-            "TOFBarrelRecHit",
+            "TOFBarrelRecHits",
             "TOFEndcapRecHits",
 
-            "TOFBarrelRawHit",
+            "TOFBarrelRawHits",
             "TOFEndcapRawHits",
 
             "TOFBarrelHits",