diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py b/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py
index 113679077f46be393e6231753ec55f1d66cba55a..ee83837ab0749cbd4c9a37037bdc4fa000085dc7 100755
--- a/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py
@@ -32,6 +32,9 @@ from TrigCaloRec.TrigCaloClusterMakerMonitoring import TrigL1BSTowerHypoOnlineMo
 from CaloClusterCorrection.common import *
 from CaloUtils.CaloUtilsConf import *
 
+# MT stuff
+from TrigCaloRec.TrigCaloRecConf import HLTCaloCellMaker as _HLTCaloCellMaker
+
 
 from AthenaCommon.Constants import INFO,ERROR,FALSE,TRUE,DEBUG,VERBOSE
 from AthenaCommon.SystemOfUnits import GeV,MeV,deg
@@ -1984,3 +1987,9 @@ class TrigCaloClusterMakerMT_EMtopo (TrigCaloClusterMakerMTBase):
         self += emtopomoments
 
 
+class HLTCaloCellMaker (_HLTCaloCellMaker):
+    __slots__ = []
+    def __init__(self, name):
+        super( HLTCaloCellMaker, self ).__init__(name)
+        self.ExtraInputs=[('TileEMScale','ConditionStore+TileEMScale')]
+
diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/share/testMET.py b/Trigger/TrigAlgorithms/TrigEFMissingET/share/testMET.py
index 9a395cf96f632c4571b9e811d1dd65e333666e47..a29d3411c711cfb8b7b73827717ac1ba20c229ef 100644
--- a/Trigger/TrigAlgorithms/TrigEFMissingET/share/testMET.py
+++ b/Trigger/TrigAlgorithms/TrigEFMissingET/share/testMET.py
@@ -24,8 +24,9 @@ svcMgr.TrigCaloDataAccessSvc.OutputLevel=INFO
 from L1Decoder.L1DecoderConf import CreateFullScanRoI
 topSequence += CreateFullScanRoI()
 
-from TrigCaloRec.TrigCaloRecConf import HLTCaloCellMaker
-cellMakerAlgo =  HLTCaloCellMaker("CellMakerMT", roiMode=True)
+from TrigCaloRec.TrigCaloRecConfig import HLTCaloCellMaker
+cellMakerAlgo =  HLTCaloCellMaker("CellMakerMT")
+cellMakerAlgo.roiMode=True
 cellMakerAlgo.RoIs="FullScanRoIs" 
 
 cellMakerAlgo.OutputLevel=VERBOSE
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
index 155e17fdea42539fa7e5d80d58a18a1d9809321d..d6829bdae9ea7d9a7ed0d55d8814e83cfee76c35 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
@@ -41,12 +41,13 @@ def jetRecoSequence(inputMakerOut):
     svcMgr.TrigCaloDataAccessSvc.MonTool = mon
 
 
-    from TrigCaloRec.TrigCaloRecConf import HLTCaloCellMaker, HLTCaloCellSumMaker
+    from TrigCaloRec.TrigCaloRecConfig import HLTCaloCellMaker
+    from TrigCaloRec.TrigCaloRecConf import HLTCaloCellSumMaker
     algo1=HLTCaloCellMaker("testFastAlgo1")
     algo1.RoIs=inputMakerOut
     #     algo1.RoIs="StoreGateSvc+FSJETRoIs"
     # temporary fix for Tile
-    algo1.ExtraInputs=[('TileEMScale','ConditionStore+TileEMScale')]
+    #algo1.ExtraInputs=[('TileEMScale','ConditionStore+TileEMScale')]
     algo1.TrigDataAccessMT=svcMgr.TrigCaloDataAccessSvc
     algo1.roiMode=False
     # algo1.roiMode=True
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py
index 67534b6af66a995e00de1f07d7e377b32f5d2ed4..d2d5b36ac1223fcad24a1776291911ac720ce0be 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py
@@ -40,11 +40,13 @@ if TriggerFlags.doCalo:
      #l1DecoderTest=L1DecoderTest()
      #topSequence+=l1DecoderTest
     
-     from TrigCaloRec.TrigCaloRecConf import HLTCaloCellMaker, HLTCaloCellSumMaker
+     from TrigCaloRec.TrigCaloRecConfig import HLTCaloCellMaker
+     from TrigCaloRec.TrigCaloRecConf import HLTCaloCellSumMaker
+
      algo1=HLTCaloCellMaker("testFastAlgo1")
      algo1.RoIs="StoreGateSvc+EMRoIs"
      # temporary fix for Tile
-     algo1.ExtraInputs=[('TileEMScale','ConditionStore+TileEMScale')]
+     #algo1.ExtraInputs=[('TileEMScale','ConditionStore+TileEMScale')]
      algo1.TrigDataAccessMT=svcMgr.TrigCaloDataAccessSvc
      #algo1.roiMode=False
      algo1.OutputLevel=VERBOSE
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/jet.recoToy.py b/Trigger/TrigValidation/TrigUpgradeTest/share/jet.recoToy.py
index 54f027c36f712038aef85d3de05d54c69c0dd296..718f9de8fbdb363353c7767718f224fc27a0752a 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/jet.recoToy.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/jet.recoToy.py
@@ -45,7 +45,8 @@ if TriggerFlags.doCalo:
      svcMgr.TrigCaloDataAccessSvc.OutputLevel=INFO
      svcMgr.TrigCaloDataAccessSvc.MonTool = mon
     
-     from TrigCaloRec.TrigCaloRecConf import HLTCaloCellMaker, HLTCaloCellSumMaker
+     from TrigCaloRec.TrigCaloRecConfig import HLTCaloCellMaker\
+     from TrigCaloRec.TrigCaloRecConf import HLTCaloCellSumMaker
      algo1=HLTCaloCellMaker("testFastAlgo1")
      algo1.RoIs="StoreGateSvc+FSJETRoIs"
      algo1.TrigDataAccessMT=svcMgr.TrigCaloDataAccessSvc