diff --git a/MagneticField/MagFieldElements/MagFieldElements/AtlasFieldCache.h b/MagneticField/MagFieldElements/MagFieldElements/AtlasFieldCache.h
index c61d4e776d509657ea10b8417cc04e3c5aaccd80..6e52e4c7e37210027d9302dab71b22a2e27d378d 100644
--- a/MagneticField/MagFieldElements/MagFieldElements/AtlasFieldCache.h
+++ b/MagneticField/MagFieldElements/MagFieldElements/AtlasFieldCache.h
@@ -59,6 +59,10 @@ namespace MagField {
                                double* ATH_RESTRICT bxyz, 
                                double* ATH_RESTRICT deriv = nullptr);
     
+        /** status of the magnets */
+        bool solenoidOn() const { return m_fieldMap ? m_fieldMap->solenoidOn() : false; }
+        bool toroidOn() const   { return m_fieldMap ? m_fieldMap->toroidOn()   : false; }
+
     private:
     
         AtlasFieldCache(const AtlasFieldCache& other)             = delete;
@@ -105,7 +109,7 @@ bool
 MagField::AtlasFieldCache::fillFieldCache(double z, double r, double phi) 
 {
     // search for the zone
-    const BFieldZone* zone = m_fieldMap->findBFieldZone( z, r, phi );
+    const BFieldZone* zone = m_fieldMap ? m_fieldMap->findBFieldZone( z, r, phi ) : nullptr;
     if ( zone == nullptr ) {
         // outsize all zones
         return false;
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibPatRec/MuonCalibPatRec/MuonSegmentToCalibSegment.h b/MuonSpectrometer/MuonCalib/MuonCalibPatRec/MuonCalibPatRec/MuonSegmentToCalibSegment.h
index 225baf1a2b80f33e9fe51896fd68b3d1b0b61b90..35424b282b3846a86663b2e86c4e349d3df59f1d 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibPatRec/MuonCalibPatRec/MuonSegmentToCalibSegment.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibPatRec/MuonCalibPatRec/MuonSegmentToCalibSegment.h
@@ -47,9 +47,6 @@ output the muon calibration input.
 
   private:
 
-    // temporary execute until migration to re-entrant alg  
-    StatusCode execute_r (const EventContext& ctx) const;
-      
     /** retrieve patterns and segments from storegate */
     //    const Muon::MuonSegmentCollection* retrieveSegments();