diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py
index 41a65303e69c923171fa669a9613b624e572778c..dbbaa82341541e9afa70ebdcdde93475f00f1a97 100755
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py
@@ -56,8 +56,8 @@ elif ( DetFlags.detdescr.ID_on() ):
             else:
                 from SCT_SLHC_GeoModel.SCT_SLHC_GeoModelConf import SCT_SLHC_DetectorTool
                 sctSLHCTool = SCT_SLHC_DetectorTool()
+                sctSLHCTool.ServiceBuilderTool = InDetServMatBuilderToolSLHC
             GeoModelSvc.DetectorTools += [ sctSLHCTool ]
-            sctSLHCTool.ServiceBuilderTool = InDetServMatBuilderToolSLHC
             if not hasattr(svcMgr,'SCTLorentzAngleSvc'):
                 from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleSvc
                 SCTLorentzAngleSvc = SiLorentzAngleSvc(name = "SCTLorentzAngleSvc",
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/SetGeometryVersion.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/SetGeometryVersion.py
index 88c751e24b35def351c84735b9d0619211fd5274..4197881b70ba3629f06691933aae60636700f61a 100755
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/SetGeometryVersion.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/SetGeometryVersion.py
@@ -50,9 +50,10 @@ else:
 
 # Set the SupportedGeometry flag
 from AthenaCommon.AppMgr import release_metadata
-relversion = release_metadata()['release'].split('.')
+rel_metadata = release_metadata()
+relversion = rel_metadata['release'].split('.')
 if len(relversion) < 3:
-    relversion = release_metadata()['base release'].split('.')
+    relversion = rel_metadata['base release'].split('.')
 
 print "SetGeometryVersion.py obtained major release version %s" % relversion[0]
 GeoModelSvc.SupportedGeometry = int(relversion[0])