diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInit.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInit.py
index 239f8835bd61d5be9b62fbdc8a81398d1f40451f..621b50d67fad09a5baa747a4c6bed32cba979c53 100755
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInit.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInit.py
@@ -7,8 +7,13 @@ def _setupGeoModel():
     from AthenaCommon.JobProperties import jobproperties
     from AthenaCommon.AppMgr import ServiceMgr as svcMgr
  
-    import DetDescrCnvSvc.DetStoreConfig
-    svcMgr.DetDescrCnvSvc.IdDictFromRDB = True
+    try:
+        from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags
+        if not (hasattr(svcMgr,'DetDescrCnvSvc') and TrkDetFlags.ISF_FatrasCustomGeometry()):
+            import DetDescrCnvSvc.DetStoreConfig
+            svcMgr.DetDescrCnvSvc.IdDictFromRDB = True
+    except ImportError:
+        pass
 
     # Conditions DB setup and TagInfo
     from IOVDbSvc.CondDB import conddb
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/MuonGM.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/MuonGM.py
index 9c36000655851a922cd1bc352c17f43eb94dd39b..6057441066edca505d2da0eb08099edefdbf80af 100755
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/MuonGM.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/MuonGM.py
@@ -5,15 +5,15 @@ from AthenaCommon.DetFlags      import DetFlags
 
 if ( jobproperties.Global.DetGeo() == "ctbh8" or jobproperties.Global.DetGeo() == "ctbh6" ):
     print " CTB layout for Muon Spectrometer is not supported anymore"
- 
+
 elif ( DetFlags.detdescr.Muon_on() ):
     from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
     GeoModelSvc = GeoModelSvc()
-   
+
     from MuonGeoModel.MuonGeoModelConf import MuonDetectorTool
     GeoModelSvc.DetectorTools += [ MuonDetectorTool() ]
     GeoModelSvc.DetectorTools[ "MuonDetectorTool" ].BuildFromNova = 0
-    if ( not DetFlags.simulate.any_on() ):
+    if ( not DetFlags.simulate.any_on() or DetFlags.overlay.any_on() ):
       GeoModelSvc.DetectorTools[ "MuonDetectorTool" ].TheMuonAlignmentTool = "MuonAlignmentDbTool/MGM_AlignmentDbTool"
     else:
       GeoModelSvc.DetectorTools[ "MuonDetectorTool" ].TheMuonAlignmentTool = ""