diff --git a/QA/main_QAtrain_duo.C b/QA/main_QAtrain_duo.C
index f0239aff..22b1975e 100644
--- a/QA/main_QAtrain_duo.C
+++ b/QA/main_QAtrain_duo.C
@@ -146,7 +146,7 @@ void main_QAtrain_duo(const char *suffix="", Int_t run = 0,
   PrintSettings();
 
   TString cdbString(cdb);
-  if (cdbString.Contains("raw://"))
+  if (cdbString.Contains("raw://") && !gSystem->Getenv("OCDB_PATH"))
   {
     TGrid::Connect("alien://");
     if (!gGrid || !gGrid->IsConnected()) {
@@ -235,8 +235,8 @@ void AddAnalysisTasks(const char *suffix, const char *cdb_location)
       disableESDtrackQA=kFALSE;
       useEmptyStringForPHOS=kTRUE;
     }else if(ver==5){
-      if(n1>9 || (n1==9 && n2>=14)) disableESDtrackQA=kFALSE;
-      if(n1>9 || (n1==9 && n2>=24)) useEmptyStringForPHOS=kTRUE;
+      if(n1>9 || (n1==9 && n2>=14)) disableESDtrackQA=kFALSE;  // >= v5-09-14
+      if(n1>9 || (n1==9 && n2>=24)) useEmptyStringForPHOS=kTRUE;  // >= v5-09-24
     }
   }
 
diff --git a/bin/train_merge.sh b/bin/train_merge.sh
index 0581a4ed..ff9f591c 100755
--- a/bin/train_merge.sh
+++ b/bin/train_merge.sh
@@ -51,7 +51,7 @@ fi
 
 if [ -f "QAtrain_duo.C" ]; then
     echo "QAtrain_duo macro found"
-    if grep -q -E -e "/cpass1|cpass1/" *.xml; then
+    if grep -q -E -e "/cpass1|cpass1/" *.xml || grep -q -E -e "/cpass1|cpass1/" "$1"; then
         echo "* Running QA duo on _barrel" >&2
         time aliroot -b -q -x QAtrain_duo.C\(\"_barrel\",$runNum,\"$1\",$2\) >stdout.barrel.log 2>stderr.barrel.log