diff --git a/CaloFuture/CaloFuturePIDs/src/SelectiveBremMatchAlg.cpp b/CaloFuture/CaloFuturePIDs/src/SelectiveBremMatchAlg.cpp
index b3d4591aee7c856e955d090b2fa15844d4a661f5..3de199d96b9ed1f3bae6b182a309094780a52d7a 100644
--- a/CaloFuture/CaloFuturePIDs/src/SelectiveBremMatchAlg.cpp
+++ b/CaloFuture/CaloFuturePIDs/src/SelectiveBremMatchAlg.cpp
@@ -168,14 +168,20 @@ namespace LHCb::Calo {
   // ============================================================================
 
   SelectiveBremMatchAlg::SelectiveBremMatchAlg( const std::string& name, ISvcLocator* pSvc )
-      : MultiTransformer( name, pSvc,
-                          // Inputs
-                          {KeyValue( "Detector", {CaloFutureAlgUtils::DeCaloFutureLocation( "Ecal" )} ),
-                           KeyValue( "InputHypos", {CaloFutureAlgUtils::CaloFutureHypoLocation( "Photons" )} ),
-                           KeyValue( "InputDigits", {CaloDigitLocation::Ecal} ), KeyValue( "TracksInCalo", "" ),
-                           KeyValue( "cellSizeCovariances", {"AlgorithmSpecific-" + name + "-cellsizecovariances"} )},
-                          // Outputs
-                          {KeyValue( "OutputMatchTable", {} ), KeyValue( "OutputEnergyTable", {} )} ) {}
+      : MultiTransformer(
+            name, pSvc,
+            // Inputs
+            {KeyValue( "Detector", {CaloFutureAlgUtils::DeCaloFutureLocation( "Ecal" )} ),
+             KeyValue( "InputHypos", {CaloFutureAlgUtils::CaloFutureHypoLocation( "Photons" )} ),
+             KeyValue( "InputDigits", {CaloDigitLocation::Ecal} ), KeyValue( "TracksInCalo", "" ),
+#ifdef USE_DD4HEP
+             KeyValue( "cellSizeCovariances", {"/world:AlgorithmSpecific-" + name + "-cellsizecovariances"} )},
+#else
+             KeyValue( "cellSizeCovariances", {"AlgorithmSpecific-" + name + "-cellsizecovariances"} )},
+#endif
+            // Outputs
+            {KeyValue( "OutputMatchTable", {} ), KeyValue( "OutputEnergyTable", {} )} ) {
+  }
 
   // ============================================================================
   //   Initialization of algorithm / tool
diff --git a/CaloFuture/CaloFuturePIDs/src/SelectiveElectronMatchAlg.cpp b/CaloFuture/CaloFuturePIDs/src/SelectiveElectronMatchAlg.cpp
index 7b4073a6910f570673cef2fcc80b341a7d88c7e2..544ed2e736dbe73e5a7333467451c59a65cbc80b 100644
--- a/CaloFuture/CaloFuturePIDs/src/SelectiveElectronMatchAlg.cpp
+++ b/CaloFuture/CaloFuturePIDs/src/SelectiveElectronMatchAlg.cpp
@@ -176,10 +176,15 @@ namespace LHCb::Calo {
                      {KeyValue( "Detector", {CaloFutureAlgUtils::DeCaloFutureLocation( "Ecal" )} ),
                       KeyValue( "InputHypos", {LHCb::CaloFutureAlgUtils::CaloFutureHypoLocation( "Electrons" )} ),
                       KeyValue( "InputTracks2Clusters", "" ),
+#ifdef USE_DD4HEP
+                      KeyValue( "XCorrections", {"/world:AlgorithmSpecific-" + name + "-xcorrections"} ),
+#else
                       KeyValue( "XCorrections", {"AlgorithmSpecific-" + name + "-xcorrections"} ),
+#endif
                       KeyValue( "Magnet", LHCb::Det::Magnet::det_path )},
                      // Outputs
-                     {KeyValue( "Output", "" )} ) {}
+                     {KeyValue( "Output", "" )} ) {
+  }
 
   // ============================================================================
   //   Initialization of algorithm / tool
diff --git a/CaloFuture/CaloFuturePIDs/src/SelectiveTrackMatchAlg.cpp b/CaloFuture/CaloFuturePIDs/src/SelectiveTrackMatchAlg.cpp
index f827c7b6142ff93d9f32ef562d81578e6a1534ea..156a37ec38a1057e308b60823e2422f275876625 100644
--- a/CaloFuture/CaloFuturePIDs/src/SelectiveTrackMatchAlg.cpp
+++ b/CaloFuture/CaloFuturePIDs/src/SelectiveTrackMatchAlg.cpp
@@ -104,9 +104,14 @@ namespace LHCb::Calo {
                      {KeyValue( "Detector", {CaloFutureAlgUtils::DeCaloFutureLocation( "Ecal" )} ),
                       KeyValue( "InputClusters", {CaloFutureAlgUtils::CaloFutureClusterLocation( "Ecal" )} ),
                       KeyValue( "InputTracksInCalo", "" ),
+#ifdef USE_DD4HEP
+                      KeyValue( "cellSizeCovariances", {"/world:AlgorithmSpecific-" + name + "-cellsizecovariances"} )},
+#else
                       KeyValue( "cellSizeCovariances", {"AlgorithmSpecific-" + name + "-cellsizecovariances"} )},
+#endif
                      // Outputs
-                     {KeyValue( "Output", {CaloFutureAlgUtils::CaloFutureIdLocation( "ClusterMatch" )} )} ) {}
+                     {KeyValue( "Output", {CaloFutureAlgUtils::CaloFutureIdLocation( "ClusterMatch" )} )} ) {
+  }
 
   // ============================================================================
   //   Initialization of algorithm / tool