diff --git a/CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc b/CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc
index 8f440bc60ebe0..72ce528c1563a 100644
--- a/CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc
+++ b/CalibCalorimetry/CaloTPG/plugins/CaloTPGTranscoderULUTs.cc
@@ -155,7 +155,8 @@ CaloTPGTranscoderULUTs::ReturnType CaloTPGTranscoderULUTs::produce(const CaloTPG
 
   const auto& lutMetadata = iRecord.get(lutMetadataToken);
   const auto& theTrigTowerGeometry = iRecord.get(theTrigTowerGeometryToken);
-  const auto& topo = iRecord.get(topoToken);
+  const auto& topoRecord = iRecord.getRecord<HcalLutMetadataRcd>();
+  const auto& topo = topoRecord.get(topoToken);
 
   HcalLutMetadata fullLut{lutMetadata};
   fullLut.setTopo(&topo);
diff --git a/CalibCalorimetry/HcalTPGEventSetup/src/HcalTPGCoderULUT.cc b/CalibCalorimetry/HcalTPGEventSetup/src/HcalTPGCoderULUT.cc
index fcbe695f4e6a6..775a10cb76255 100644
--- a/CalibCalorimetry/HcalTPGEventSetup/src/HcalTPGCoderULUT.cc
+++ b/CalibCalorimetry/HcalTPGEventSetup/src/HcalTPGCoderULUT.cc
@@ -160,7 +160,8 @@ HcalTPGCoderULUT::ReturnType HcalTPGCoderULUT::produce(const HcalTPGRecord& iRec
   auto host = holder_.makeOrGet([]() { return new HostType; });
 
   const auto& topo = iRecord.get(topoToken_);
-  const auto& delay = iRecord.get(delayToken_);
+  const auto& delayRcd = iRecord.getRecord<HcalDbRecord>();
+  const auto& delay = delayRcd.get(delayToken_);
   if (read_Ascii_ || read_XML_) {
     buildCoder(&topo, &delay, host.get());
   } else {
diff --git a/CalibTracker/SiPhase2TrackerESProducers/plugins/SiPhase2OuterTrackerFakeLorentzAngleESSource.cc b/CalibTracker/SiPhase2TrackerESProducers/plugins/SiPhase2OuterTrackerFakeLorentzAngleESSource.cc
index d8ebabd51b20e..88ca7611fa571 100644
--- a/CalibTracker/SiPhase2TrackerESProducers/plugins/SiPhase2OuterTrackerFakeLorentzAngleESSource.cc
+++ b/CalibTracker/SiPhase2TrackerESProducers/plugins/SiPhase2OuterTrackerFakeLorentzAngleESSource.cc
@@ -69,13 +69,13 @@ namespace fakeOTLA {
 
 std::unique_ptr<SiPhase2OuterTrackerLorentzAngle> SiPhase2OuterTrackerFakeLorentzAngleESSource::produceOTLA(
     const SiPhase2OuterTrackerLorentzAngleRcd& rcd) {
-  const auto& geomDet = rcd.get(m_geomDetToken);
+  const auto& geomDet = rcd.getRecord<TrackerTopologyRcd>().get(m_geomDetToken);
   return fakeOTLA::produceRecord<SiPhase2OuterTrackerLorentzAngle>(LAvalue_, geomDet);
 }
 
 std::unique_ptr<SiPhase2OuterTrackerLorentzAngle> SiPhase2OuterTrackerFakeLorentzAngleESSource::produceOTSimLA(
     const SiPhase2OuterTrackerLorentzAngleSimRcd& rcd) {
-  const auto& geomDet = rcd.get(m_geomDetToken);
+  const auto& geomDet = rcd.getRecord<TrackerTopologyRcd>().get(m_geomDetToken);
   return fakeOTLA::produceRecord<SiPhase2OuterTrackerLorentzAngle>(LAvalue_, geomDet);
 }
 
diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc
index 4e2f1db1a9420..cf089d0f24a20 100644
--- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc
+++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripBackPlaneCorrectionFakeESSource.cc
@@ -65,7 +65,8 @@ SiStripBackPlaneCorrectionFakeESSource::ReturnType SiStripBackPlaneCorrectionFak
     const SiStripBackPlaneCorrectionRcd& iRecord) {
   using namespace edm::es;
 
-  const auto& geomDet = iRecord.get(m_geomDetToken);
+  const auto& geomDetRcd = iRecord.getRecord<TrackerTopologyRcd>();
+  const auto& geomDet = geomDetRcd.get(m_geomDetToken);
   const auto& tTopo = iRecord.get(m_tTopoToken);
 
   auto backPlaneCorrection = std::make_unique<SiStripBackPlaneCorrection>();
diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripHashedDetIdFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripHashedDetIdFakeESSource.cc
index f66b4bfd2f91a..39793a014c857 100644
--- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripHashedDetIdFakeESSource.cc
+++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripHashedDetIdFakeESSource.cc
@@ -31,7 +31,8 @@ std::unique_ptr<SiStripHashedDetId> SiStripHashedDetIdFakeESSource::produce(cons
   edm::LogVerbatim("HashedDetId") << "[SiStripHashedDetIdFakeESSource::" << __func__ << "]"
                                   << " Building \"fake\" hashed DetId map from IdealGeometry";
 
-  const auto& geomDet = record.get(geomDetToken_);
+  const auto& geomDetRcd = record.getRecord<TrackerDigiGeometryRecord>();
+  const auto& geomDet = geomDetRcd.get(geomDetToken_);
 
   const std::vector<uint32_t> dets = TrackerGeometryUtils::getSiStripDetIds(geomDet);
   edm::LogVerbatim("HashedDetId") << "[SiStripHashedDetIdFakeESSource::" << __func__ << "]"
diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripLorentzAngleFakeESSource.cc b/CalibTracker/SiStripESProducers/plugins/fake/SiStripLorentzAngleFakeESSource.cc
index eca60cd7985d6..5c1710758a318 100644
--- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripLorentzAngleFakeESSource.cc
+++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripLorentzAngleFakeESSource.cc
@@ -183,7 +183,8 @@ SiStripLorentzAngleFakeESSource::ReturnType SiStripLorentzAngleFakeESSource::pro
     const SiStripLorentzAngleRcd& iRecord) {
   using namespace edm::es;
 
-  const auto& geomDet = iRecord.get(m_geomDetToken);
+  const auto& geomDetRcd = iRecord.getRecord<TrackerTopologyRcd>();
+  const auto& geomDet = geomDetRcd.get(m_geomDetToken);
   const auto& tTopo = iRecord.get(m_tTopoToken);
 
   auto lorentzAngle = std::make_unique<SiStripLorentzAngle>();
diff --git a/RecoLocalCalo/HcalRecAlgos/plugins/HcalChannelPropertiesEP.cc b/RecoLocalCalo/HcalRecAlgos/plugins/HcalChannelPropertiesEP.cc
index 8f61c772d4c3f..e9ea228b97193 100644
--- a/RecoLocalCalo/HcalRecAlgos/plugins/HcalChannelPropertiesEP.cc
+++ b/RecoLocalCalo/HcalRecAlgos/plugins/HcalChannelPropertiesEP.cc
@@ -74,7 +74,7 @@ class HcalChannelPropertiesEP : public edm::ESProducer {
     const HcalDbService& cond = dbRecord.get(condToken_);
     const HcalRecoParams& params = rcd.get(myParamsToken_);
     const HcalSeverityLevelComputer& severity = rcd.get(sevToken_);
-    const HcalChannelQuality& qual = rcd.get(qualToken_);
+    const HcalChannelQuality& qual = dbRecord.get(qualToken_);
     const CaloGeometry& geom = rcd.get(geomToken_);
 
     // HcalTopology is taken from "params" created by the "produce1" method