diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index 5025f59995a8f4a5ec76299fe23cbe39d9ec8d06..8cbe2f60e718df79370c5535204ae9d1470bd064 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -81,6 +81,8 @@ def _createCfgFlags():
             return "AthSimulation"
         if "AthGeneration_DIR" in os.environ:
             return "AthGeneration"
+        if "AthAnalysis_DIR" in os.environ:
+            return "AthAnalysis"
         #TODO expand this method.
         return "Athena"
     acf.addFlag('Common.Project', _checkProject())
diff --git a/Event/xAOD/xAODMetaDataCnv/python/TestWriteFileMetaData.py b/Event/xAOD/xAODMetaDataCnv/python/TestWriteFileMetaData.py
index a2e4c548764c45c2981394020ce9f146499dbeb0..917276fa7582779da04c51c7b941889c8c2aba17 100644
--- a/Event/xAOD/xAODMetaDataCnv/python/TestWriteFileMetaData.py
+++ b/Event/xAOD/xAODMetaDataCnv/python/TestWriteFileMetaData.py
@@ -23,7 +23,7 @@ def writeFileMetaData(flags):
 
     accumulator.merge(
         xAODEventInfoCnvConfig.EventInfoCnvAlgCfg(
-            flags=flags, inputKey="",
+            flags=flags, inputKey="", disableBeamSpot=flags.Common.Project!="Athena"
         )
     )