diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/JetTagCalibConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/JetTagCalibConfig.py
index 2fce8bc1d92ff010d1705bd9c4b74026a09f1374..dc3b8ad909ca9a904d09e92b27f0a01cf3dc2eea 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/JetTagCalibConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/JetTagCalibConfig.py
@@ -1,7 +1,6 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 from IOVDbSvc.CondDB import conddb
 from AthenaConfiguration.ComponentFactory import CompFactory
-from IOVDbSvc.IOVDbSvcConfig import addFolders
 from BTagging.BTaggingFlags import BTaggingFlags
 
 def JetTagCalibCfg(ConfigFlags, scheme="", TaggerList = [], ChannelAlias = ""):
@@ -15,7 +14,6 @@ def JetTagCalibCfg(ConfigFlags, scheme="", TaggerList = [], ChannelAlias = ""):
     JetTagCalibCondAlg,=CompFactory.getComps("Analysis__JetTagCalibCondAlg",)
     jettagcalibcondalg = "JetTagCalibCondAlg"
     readkeycalibpath = "/GLOBAL/Onl/TrigBTagCalib/RUN12"
-    connSchema = "GLOBAL"
     histoskey = "JetTagTrigCalibHistosKey"
     conddb.addFolder("GLOBAL_ONL", "/GLOBAL/Onl/TrigBTagCalib/RUN12", className='CondAttrListCollection')
 
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 7dd579889440d42b3f0a932fb348cad16fa77ca4..32417d8bdc9cd1a54472c466261f63d93344f85b 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -558,11 +558,10 @@ triggerIDCCacheCreatorsCfg(ConfigFlags).appendToGlobals()
 Configurable.configurableRun3Behavior-=1
 
 # B-jet output file
-log.info("opt.enabledSignatures")
-log.info(opt.enabledSignatures)
-from TriggerJobOpts.JetTagCalibConfig import JetTagCalibCfg
-alias = ["HLT_InView->HLT_InView,AntiKt4EMTopo"]
-topSequence+=JetTagCalibCfg(ConfigFlags, ChannelAlias = alias)
+if opt.doBjetSlice or opt.forceEnableAllChains:
+    from TriggerJobOpts.JetTagCalibConfig import JetTagCalibCfg
+    alias = ["HLT_InView->HLT_InView,AntiKt4EMTopo"]
+    topSequence+=JetTagCalibCfg(ConfigFlags, ChannelAlias = alias)
 
 # Trigger output
 if opt.doWriteBS or opt.doWriteRDOTrigger:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetFlavourTaggingConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetFlavourTaggingConfiguration.py
index 878ceb4298af4c8ef546d874d3f38a5a8da36786..8a226f5316387388bece966af0764797bf69ed28 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetFlavourTaggingConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetFlavourTaggingConfiguration.py
@@ -59,13 +59,12 @@ def getFlavourTagging( inputJets, inputVertex, inputTracks ):
     for k, v in SecVertexingAndAssociators.items():
         if v not in TrackToJetAssociators:
             raise RuntimeError( v + ' is not configured')
-        acc.merge(JetSecVtxFindingAlgCfg(ConfigFlags, inputJets, inputTracks, k, v))
+        acc.merge(JetSecVtxFindingAlgCfg(ConfigFlags, inputJets.replace("Jets",""), inputTracks, k, v))
         JetSecVertexingAlg = JetSecVertexingAlgCfg(ConfigFlags, inputJets.replace("Jets",""), inputTracks, k, v)
+        SecVertexingAlg = JetSecVertexingAlg.getEventAlgo(inputJets.replace("Jets","").lower() + "_" + k.lower() + "_secvtx") #If inputJets.replace("Jets","") is used in JetSecVertexingAlgCfg; Have to change it here aswell
         if k == "JetFitter":
-            SecVertexingAlg = JetSecVertexingAlg.getEventAlgo("hlt_inview_jetfitter_secvtx")
             SecVertexingAlg.BTagJFVtxCollectionName = recordable("HLT_JFVtx")
         elif k == "SV1":
-            SecVertexingAlg = JetSecVertexingAlg.getEventAlgo("hlt_inview_sv1_secvtx")
             SecVertexingAlg.BTagSVCollectionName = recordable("HLT_SecVtx")
         acc.merge(JetSecVertexingAlg)