diff --git a/Simulation/ISF/ISF_Config/python/ISF_MainConfig.py b/Simulation/ISF/ISF_Config/python/ISF_MainConfig.py
index a90faf72eba1934e525123709f02719e7529fad1..38b856527ca19085781372845ff18b261d961ebd 100644
--- a/Simulation/ISF/ISF_Config/python/ISF_MainConfig.py
+++ b/Simulation/ISF/ISF_Config/python/ISF_MainConfig.py
@@ -181,12 +181,15 @@ def getInput_geantinos(name="ISF_Input_geantinos", **kwargs):
 
 ############## Simulator: GenericSimulator ###############
 def getKernel_GenericSimulator(name="ISF_Kernel_GenericSimulator", **kwargs):
-    kwargs.setdefault("ParticleBroker"          , "ISF_ParticleBrokerSvc"              ) #ISF_Flags.ParticleBroker.get_Value() )
-    kwargs.setdefault("TruthRecordService"      , ISF_Flags.TruthService.get_Value()   )
-    kwargs.setdefault("SimHitService"           , "ISF_SimHitService"                  )
-    kwargs.setdefault("MemoryMonitoringTool"    , "ISF_MemoryMonitor"                  )
-    kwargs.setdefault("DoCPUMonitoring"         , ISF_Flags.DoTimeMonitoring()         )
-    kwargs.setdefault("DoMemoryMonitoring"      , ISF_Flags.DoMemoryMonitoring()       )
+    kwargs.setdefault("InputHardScatterCollection", "BeamTruthEvent")
+    kwargs.setdefault("OutputHardScatterTruthCollection", "TruthEvent")
+    kwargs.setdefault("InputConverter", "ISF_InputConverter")
+    kwargs.setdefault("ParticleBroker", "ISF_ParticleBrokerSvc")
+    kwargs.setdefault("TruthRecordService", ISF_Flags.TruthService.get_Value())
+    kwargs.setdefault("SimHitService", "ISF_SimHitService")
+    kwargs.setdefault("MemoryMonitoringTool", "ISF_MemoryMonitor")
+    kwargs.setdefault("DoCPUMonitoring", ISF_Flags.DoTimeMonitoring())
+    kwargs.setdefault("DoMemoryMonitoring", ISF_Flags.DoMemoryMonitoring())
 
 
     from ISF_Algorithms.ISF_AlgorithmsConf import ISF__SimKernel
@@ -237,8 +240,8 @@ def getKernel_FullG4_LongLived(name="ISF_Kernel_FullG4_LongLived", **kwargs):
     kwargs.setdefault("IDSimulationSelectors"       , [ 'ISF_DefaultLongLivedGeant4Selector' ] )
     kwargs.setdefault("CaloSimulationSelectors"     , [ 'ISF_DefaultLongLivedGeant4Selector' ] )
     kwargs.setdefault("MSSimulationSelectors"       , [ 'ISF_DefaultLongLivedGeant4Selector' ] )
-    kwargs.setdefault("CavernSimulationSelectors"   , [ 'ISF_DefaultParticleKillerSelector' ]  )
-    kwargs.setdefault("ParticleBroker"              ,   'ISF_LongLivedParticleBrokerSvc'       )
+    kwargs.setdefault("CavernSimulationSelectors"   , [ 'ISF_DefaultParticleKillerSelector'  ] )
+    kwargs.setdefault("InputConverter"              ,   'ISF_LongLivedInputConverter'          )
     return getKernel_GenericG4Only(name, **kwargs)
 
 ############## Simulator: FullG4_IDOnly ###############
@@ -344,6 +347,9 @@ def getKernel_Fatras_newExtrapolation_IDOnly(name="ISF_Kernel_Fatras_newExtrapol
 
 ############## Simulator: ATLFASTIIF fast pileup ###############
 def getKernel_ATLFASTIIF_PileUp(name="ISF_Kernel_ATLFASTIIF_PileUp", **kwargs):
+    kwargs.setdefault("InputPileupCollection", "GEN_EVENT_PU")
+    kwargs.setdefault("OutputPileupTruthCollection", "TruthEvent_PU")
+
     kwargs.setdefault("SimHitService"              , "ISF_PileupSimHitService"                  )
     kwargs.setdefault("BeamPipeSimulationSelectors", [ 'ISF_DefaultParticleKillerSelector' ]    )
     kwargs.setdefault("IDSimulationSelectors"      , [ #'ISF_FatrasRandomSelector',
@@ -356,7 +362,6 @@ def getKernel_ATLFASTIIF_PileUp(name="ISF_Kernel_ATLFASTIIF_PileUp", **kwargs):
                                                        'ISF_DefaultFastCaloSimSelector' ]       )
     kwargs.setdefault("MSSimulationSelectors"      , [ 'ISF_DefaultFatrasSelector' ]            )
     kwargs.setdefault("CavernSimulationSelectors"  , [ 'ISF_DefaultParticleKillerSelector' ]    )
-
     # set the simFlags accordingly
     from G4AtlasApps.SimFlags import simFlags
     simFlags.SimulationFlavour = "ATLFASTIIF_PileUp"
diff --git a/Simulation/ISF/ISF_Config/share/AllDet_detDescr.py b/Simulation/ISF/ISF_Config/share/AllDet_detDescr.py
index d71f105d5d73ddd0e055fc12893a3e01af7711ef..bf5a91d0b166e5b56cb4a7de82cbd6d7dc777595 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","") and os.environ.get("AthSimulationBase_DIR", None) is None:
+    if "AthSimulationBase" not in os.environ.get("CMTEXTRATAGS",""):
         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 b402fa35b87e845e27b1ea4327970b3e4db5288d..a76214f8cb5a73553d39c72bcb3529d9689255eb 100644
--- a/Simulation/ISF/ISF_Config/share/ISF_ConfigJobInclude.py
+++ b/Simulation/ISF/ISF_Config/share/ISF_ConfigJobInclude.py
@@ -53,11 +53,6 @@ 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
 #--------------------------------------------------------------