diff --git a/LumiBlock/LumiBlockComps/python/LuminosityCondAlgDefault.py b/LumiBlock/LumiBlockComps/python/LuminosityCondAlgDefault.py
index c7c87b4684bcd84a19e744f1bc5c061eb8a170aa..61d09e6cdba97ef294932e4ad8457ae0cf3eef65 100644
--- a/LumiBlock/LumiBlockComps/python/LuminosityCondAlgDefault.py
+++ b/LumiBlock/LumiBlockComps/python/LuminosityCondAlgDefault.py
@@ -7,6 +7,7 @@
 
 from AthenaCommon.Logging import logging
 from AthenaCommon.AlgSequence import AthSequencer
+from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 
 
 _isOnline = False
@@ -14,7 +15,7 @@ _isOnline = False
 
 def LuminosityCondAlgDefault (name = 'LuminosityCondAlg',
                               suffix = '',
-                              isOnline = None):
+                              isOnline = athenaCommonFlags.isOnline()):
     if name is None:
         name = 'LuminosityCondAlg' + suffix
 
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
index 1e6cc0ea7fc7fdc1c83b993fe9bb7e0e9303f898..e79e14e6ce19aac36a3fd37e83631332e58fc89c 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
@@ -172,8 +172,8 @@ def TrigEgammaFastCaloHypoToolFromDict( d ):
     """ Use menu decoded chain dictionary to configure the tool """
     cparts = [i for i in d['chainParts'] if ((i['signature']=='Electron') or (i['signature']=='Photon'))]
 
-    from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgOnlineDefault
-    LuminosityCondAlgOnlineDefault()    
+    from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgDefault
+    LuminosityCondAlgDefault()
 
     #def __mult(cpart):
      #   return int( cpart['multiplicity'] )
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index e858b28d1dc9e93371ab8204af9e1981d5feb572..ca391ea9b078acf96d6bd388f00dd28e6be9a9ef 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -182,6 +182,7 @@ if not ConfigFlags.Input.isMC:
     globalflags.DatabaseInstance='CONDBR2' if opt.useCONDBR2 else 'COMP200'
     ConfigFlags.IOVDb.DatabaseInstance=globalflags.DatabaseInstance()
 athenaCommonFlags.isOnline.set_Value_and_Lock(opt.isOnline)
+ConfigFlags.Common.isOnline = athenaCommonFlags.isOnline()
 
 log.info('Configured the following global flags:')
 globalflags.print_JobProperties()
@@ -441,8 +442,6 @@ if ConfigFlags.Input.Format == 'POOL':
     if objKeyStore.isInInput("xAOD::EventInfo"):
         topSequence.SGInputLoader.Load += [( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' )]
     else:
-        from AthenaCommon.AlgSequence import AthSequencer
-        condSeq = AthSequencer("AthCondSeq")
         if not hasattr(hltBeginSeq, "xAODMaker::EventInfoCnvAlg"):
             from xAODEventInfoCnv.xAODEventInfoCnvAlgDefault import xAODEventInfoCnvAlgDefault
             xAODEventInfoCnvAlgDefault(sequence=hltBeginSeq)