diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelInit.py b/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelInit.py
index d17c8e39d932df7be5a7265d7b4c2403a0546430..fbee2144d985412d2624d31e745eec881f3fb54d 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelInit.py
+++ b/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelInit.py
@@ -97,7 +97,7 @@ def _setupGeoModel():
 
     #conddb.addFolderSplitOnline("SCT","/Tracker/Onl/Align","/Tracker/Align",className="AlignableTransformContainer")
     print("Override Alignment dbname to OFLP200, fix this when alignment available in CONDBR3")
-    conddb.addFolder("/Tracker/Align", "SCT_OFL",className="AlignableTransformContainer",db="OFLP200")
+    conddb.addFolder("/Tracker/Align", "SCT_OFL",className="AlignableTransformContainer")
     from AthenaCommon.AlgSequence import AthSequencer
     condSeq = AthSequencer("AthCondSeq")
     if not hasattr(condSeq, "FaserSCT_AlignCondAlg"):
diff --git a/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/python/FaserISF_HepMC_ToolsConfigNew.py b/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/python/FaserISF_HepMC_ToolsConfigNew.py
index 1a08c8ba26d980d5e001fa27b1b2d1c6f7b616a4..21a86e2026e8a13dee346d43616b677b601f1f7a 100644
--- a/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/python/FaserISF_HepMC_ToolsConfigNew.py
+++ b/Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools/python/FaserISF_HepMC_ToolsConfigNew.py
@@ -162,7 +162,7 @@ def TruthStrategyGroupCfg(ConfigFlags, name="ISF_MCTruthStrategyGroupID", **kwar
     result = ComponentAccumulator()
     kwargs.setdefault("ParentMinEkin", 100.*MeV)
     kwargs.setdefault("ChildMinEkin" , 100.*MeV)
-    kwargs.setdefault("VertexTypes", [3, 14, 15, 4, 5, 6, 7, 2, 12, 13])
+    kwargs.setdefault("VertexTypes", [3, 14, 15, 4, 5, 6, 7, 2, 12, 13, 111, 121, 131, 132, 141, 151, 152, 161, 310])  # EM *and* nuclear
     kwargs.setdefault("VertexTypeRangeLow"  , 201)  # All kinds of decay processes
     kwargs.setdefault("VertexTypeRangeHigh" , 298)  # ...
     kwargs.setdefault("Regions", [FaserRegion.fFaserNeutrino,
@@ -183,7 +183,7 @@ def TrenchStrategyGroupCfg(ConfigFlags, name="ISF_TrenchStrategyGroupID", **kwar
     result = ComponentAccumulator()
     kwargs.setdefault("ParentMinEkin", 10000.*MeV)
     kwargs.setdefault("ChildMinEkin" , 10000.*MeV)
-    kwargs.setdefault("VertexTypes", [3, 14, 15, 4, 5, 6, 7, 2, 12, 13])
+    kwargs.setdefault("VertexTypes", [3, 14, 15, 4, 5, 6, 7, 2, 12, 13, 111, 121, 131, 132, 141, 151, 152, 161, 310])  # EM *and* nuclear
     kwargs.setdefault("VertexTypeRangeLow"  , 201)  # All kinds of decay processes
     kwargs.setdefault("VertexTypeRangeHigh" , 298)  # ...
     kwargs.setdefault("Regions", [FaserRegion.fFaserTrench])