diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.GMSB.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.GMSB.py
index 39a37d7292285ee9f949258c160178dd3072cf2d..a9678d9799f34aa4b0553b90d782aec97d31ddf2 100644
--- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.GMSB.py
+++ b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.GMSB.py
@@ -127,31 +127,13 @@ load_files_for_GMSB_scenario(simdict)
 
 if doG4SimConfig:
     from G4AtlasApps.SimFlags import simFlags
-    def gmsb_processlist():
-        from G4AtlasApps import AtlasG4Eng
-        AtlasG4Eng.G4Eng.gbl.G4Commands().process.list()
-
-    simFlags.InitFunctions.add_function("postInit", gmsb_processlist)
-
-    def gmsb_setparams():
-        from G4AtlasApps import AtlasG4Eng
-        from GaudiKernel.SystemOfUnits import GeV, ns
-
-        ## Assuming that GMSBIndex is an int here...
-        GMSBIndex = int(AtlasG4Eng.G4Eng.Dict_SpecialConfiguration["GMSBIndex"])
-
-        if GMSBIndex == 1: # generic neutralino to photon scenario
-            from G4AtlasApps.SimFlags import simFlags
-            simFlags.PhysicsOptions += ["GauginosPhysicsTool"]
-
-        elif GMSBIndex == 2 or GMSBIndex == 3 or GMSBIndex == 4: # generic stau scenario
-            from G4AtlasApps.SimFlags import simFlags
-            simFlags.PhysicsOptions += ["SleptonsPhysicsTool"]
-
-        del GMSBIndex
-
-
-    simFlags.InitFunctions.add_function("preInitPhysics", gmsb_setparams)
+    ## Assuming that GMSBIndex is an int here...
+    GMSBIndex = eval(simdict["GMSBIndex"])
+    if GMSBIndex == 1: # generic neutralino to photon scenario
+        simFlags.PhysicsOptions += ["GauginosPhysicsTool"]
+    elif GMSBIndex == 2 or GMSBIndex == 3 or GMSBIndex == 4: # generic stau scenario
+        simFlags.PhysicsOptions += ["SleptonsPhysicsTool"]
+    del GMSBIndex
 
     def gmsb_applycalomctruthstrategy():
     ## Applying the MCTruth strategies: add decays in the Calorimeter
diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py
index c2028e4780a0fd3eaa534ac5458d3da1743ac376..12ac255327405b7eb0e3ef4ee95095f6dbcf56f9 100644
--- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py
+++ b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py
@@ -63,8 +63,9 @@ if doG4SimConfig:
     # FIXME ideally would include this file early enough, so that the unlocking is not required
     #simFlags.EquationOfMotion.unlock()
     simFlags.EquationOfMotion.set_On()
-    simFlags.EquationOfMotion.set_Value_and_Lock("G4mplEqMagElectricField")#"MonopoleEquationOfMotion")
+    simFlags.EquationOfMotion.set_Value_and_Lock("G4mplEqMagElectricField") #Monopole Equation of Motion
     simFlags.G4Stepper.set_Value_and_Lock('ClassicalRK4')
+    simFlags.TightMuonStepping.set_Value_and_Lock(False)
     simFlags.PhysicsOptions += ["MonopolePhysicsTool"]
     # add monopole-specific configuration for looper killer
     simFlags.OptionalUserActionList.addAction('MonopoleLooperKillerTool',['Step'])
diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py
index 886a8d1d5739e12b85684a6c06c0325940190cf2..7bf1fc1d2c9600b336a209370844d8c0c41a406d 100644
--- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py
+++ b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py
@@ -62,11 +62,6 @@ if doG4SimConfig:
     from G4AtlasApps import AtlasG4Eng
     AtlasG4Eng.G4Eng.log.info("Unlocking simFlags.EquationOfMotion to reset the value for Monopole simulation.")
     from G4AtlasApps.SimFlags import simFlags
-    # FIXME ideally would include this file early enough, so that the unlocking is not required
-    simFlags.EquationOfMotion.unlock()
-    simFlags.EquationOfMotion.set_On()
-    simFlags.EquationOfMotion.set_Value_and_Lock("G4mplEqMagElectricField")#"MonopoleEquationOfMotion")
-    simFlags.G4Stepper.set_Value_and_Lock('ClassicalRK4')
     simFlags.PhysicsOptions += ["MonopolePhysicsTool"]
     # add monopole-specific configuration for looper killer
     simFlags.OptionalUserActionList.addAction('MonopoleLooperKillerTool',['Step'])