diff --git a/Simulation/ISF/ISF_Config/python/ISF_Geant4CommonConfig.py b/Simulation/ISF/ISF_Config/python/ISF_Geant4CommonConfig.py
deleted file mode 100644
index 74583d364ec2ca794156596c7254d9b234a940c6..0000000000000000000000000000000000000000
--- a/Simulation/ISF/ISF_Config/python/ISF_Geant4CommonConfig.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
diff --git a/Simulation/ISF/ISF_Config/share/AllDet_detDescr.py b/Simulation/ISF/ISF_Config/share/AllDet_detDescr.py
index bf5a91d0b166e5b56cb4a7de82cbd6d7dc777595..d71f105d5d73ddd0e055fc12893a3e01af7711ef 100644
--- a/Simulation/ISF/ISF_Config/share/AllDet_detDescr.py
+++ b/Simulation/ISF/ISF_Config/share/AllDet_detDescr.py
@@ -17,7 +17,7 @@ if DetFlags.detdescr.any_on():
         protectedInclude("InDetBeamSpotService/BeamCondSvc.py" )
 
     import os
-    if "AthSimulationBase" not in os.environ.get("CMTEXTRATAGS",""):
+    if "AthSimulationBase" not in os.environ.get("CMTEXTRATAGS","") and os.environ.get("AthSimulationBase_DIR", None) is None:
         if DetFlags.detdescr.LAr_on():
             protectedInclude( "LArDetDescr/LArDetDescr_joboptions.py" )
 
diff --git a/Simulation/ISF/ISF_Config/share/ISF_ConfigJobInclude.py b/Simulation/ISF/ISF_Config/share/ISF_ConfigJobInclude.py
index 6dc8fa3a19feec7d94274f2e5a2c81ef836894c1..b402fa35b87e845e27b1ea4327970b3e4db5288d 100644
--- a/Simulation/ISF/ISF_Config/share/ISF_ConfigJobInclude.py
+++ b/Simulation/ISF/ISF_Config/share/ISF_ConfigJobInclude.py
@@ -53,6 +53,11 @@ if globalflags.DetDescrVersion() not in simFlags.SimLayout.get_Value():
 simFlags.load_atlas_flags()
 simFlags.EventFilter.set_Off()
 
+# --- Read in special simulation job option fragments based on
+# --- metadata passed by the evgen stage (move earlier?)
+from ISF_Example.ISF_Metadata import checkForSpecialConfigurationMetadata
+checkForSpecialConfigurationMetadata()
+
 #--------------------------------------------------------------
 # Job setup
 #--------------------------------------------------------------
@@ -85,7 +90,6 @@ theApp.AuditServices   = True
 # --- Display detailed size and timing statistics for writing and reading
 ServiceMgr.AthenaPoolCnvSvc.UseDetailChronoStat = True
 
-
 #--------------------------------------------------------------
 # ISF input
 #--------------------------------------------------------------
@@ -160,7 +164,9 @@ simFlags.RandomSeedList.printSeeds()
 # Setup the ISF Output
 #--------------------------------------------------------------
 from ISF_Example.ISF_Output import ISF_HITSStream
-
+from ISF_Example.ISF_Metadata import createSimulationParametersMetadata, configureRunNumberOverrides
+createSimulationParametersMetadata()
+configureRunNumberOverrides()
 #--------------------------------------------------------------
 # Post kernel configuration
 #--------------------------------------------------------------