diff --git a/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi.sh b/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi.sh
index 21ac59fbd1f7d717abc307a31216b9b402b43f76..b6b0c80c42a44e1d3731bd92e2fa800aa8036316 100755
--- a/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi.sh
+++ b/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi.sh
@@ -186,7 +186,7 @@ then
     ls -l
     echo "copy *-RDO.root to $outdest"
     mkdir -p $outdest
-    eos cp *-RDO.root $outdest
+    eos cp *-RDO.root ${outdest}/ || true
 fi
 #
 # Also copy log file
@@ -196,12 +196,12 @@ then
     ls -l
     echo "copy $logfile to $logdest"
     mkdir -p $logdest
-    eos cp $logfile $logdest
+    eos cp $logfile $logdest/$logfile
 elif ! [ -z "$outdest" ]
 then 
     cd ..
     ls -l
     echo "copy $logfile to $outdest"
     mkdir -p $outdest
-    eos cp $logfile $outdest
+    eos cp $logfile $outdest/$logfile
 fi
diff --git a/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi_merge.sh b/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi_merge.sh
index e5d45909651a8f02805dc5a29c9b7c16a531c57b..ca2e27fcc6956e1ff180dacc41cf1f9ee2e304bf 100755
--- a/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi_merge.sh
+++ b/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi_merge.sh
@@ -209,7 +209,7 @@ then
     ls -l
     echo "copy *-RDO.root to $outdest"
     mkdir -p $outdest
-    eos cp *-RDO.root $outdest
+    eos cp *-RDO.root ${outdest}/ || true
 fi
 #
 # Also copy log file
@@ -219,12 +219,12 @@ then
     ls -l
     echo "copy $logfile to $logdest"
     mkdir -p $logdest
-    eos cp $logfile $logdest
+    eos cp $logfile $logdest/$logfile
 elif ! [ -z "$outdest" ]
 then 
     cd ..
     ls -l
     echo "copy $logfile to $outdest"
     mkdir -p $outdest
-    eos cp $logfile $outdest
+    eos cp $logfile $outdest/$logfile
 fi
diff --git a/Control/CalypsoExample/Generation/scripts/submit_faserMDC_foresee.sh b/Control/CalypsoExample/Generation/scripts/submit_faserMDC_foresee.sh
index 723ffb6d50b0243878b261639cc1bab461b7da97..94d9ab8b85e2dbf30498662178e599a519641951 100755
--- a/Control/CalypsoExample/Generation/scripts/submit_faserMDC_foresee.sh
+++ b/Control/CalypsoExample/Generation/scripts/submit_faserMDC_foresee.sh
@@ -202,7 +202,7 @@ then
     ls -l
     echo "copy *-HITS.root to $outdest"
     mkdir -p $outdest
-    eos cp *-HITS.root $outdest
+    eos cp *-HITS.root ${outdest}/ || true
 fi
 #
 # Also copy log file
@@ -212,12 +212,12 @@ then
     ls -l
     echo "copy $logfile to $logdest"
     mkdir -p $logdest
-    eos cp $logfile $logdest
+    eos cp $logfile $logdest/$logfile
 elif ! [ -z "$outdest" ]
 then 
     cd ..
     ls -l
     echo "copy $logffile to $outdest"
     mkdir -p $outdest
-    eos cp $logfile $outdest
+    eos cp $logfile $outdest/$logfile
 fi
diff --git a/Control/CalypsoExample/Generation/scripts/submit_faserMDC_particlegun.sh b/Control/CalypsoExample/Generation/scripts/submit_faserMDC_particlegun.sh
index 729d75c751e33146a2af334315392d3b16692106..5d704e9a51445d2ae408512c4eb0df83c71a8b39 100755
--- a/Control/CalypsoExample/Generation/scripts/submit_faserMDC_particlegun.sh
+++ b/Control/CalypsoExample/Generation/scripts/submit_faserMDC_particlegun.sh
@@ -200,7 +200,7 @@ then
     ls -l
     echo "copy *-HITS.root to $outdest"
     mkdir -p $outdest
-    eos cp *-HITS.root $outdest
+    eos cp *-HITS.root ${outdest}/ || true
 fi
 #
 # Also copy log file
@@ -210,12 +210,12 @@ then
     ls -l
     echo "copy $logfile to $logdest"
     mkdir -p $logdest
-    eos cp $logfile $logdest
+    eos cp $logfile $logdest/$logfile
 elif ! [ -z "$outdest" ]
 then 
     cd ..
     ls -l
     echo "copy $logfile to $outdest"
     mkdir -p $outdest
-    eos cp $logfile $outdest
+    eos cp $logfile $outdest/$logfile
 fi
diff --git a/Control/CalypsoExample/Reconstruction/scripts/submit_faserMDC_reco.sh b/Control/CalypsoExample/Reconstruction/scripts/submit_faserMDC_reco.sh
index 819cfeb49014f33f1bde93fdd53b22c2b075e795..5dacef1cf4152e0a1cd817d7e52e9c38c65a1fb9 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/submit_faserMDC_reco.sh
+++ b/Control/CalypsoExample/Reconstruction/scripts/submit_faserMDC_reco.sh
@@ -175,7 +175,8 @@ then
     ls -l
     echo "copy *-RDO.root to $outdest"
     mkdir -p $outdest
-    eos cp *-xAOD.root $outdest
+    # Keep this line from stopping script, so we might get a log file
+    eos cp *-xAOD.root ${outdest}/ || true
 fi
 #
 # Also copy log file
@@ -185,12 +186,12 @@ then
     ls -l
     echo "copy $logfile to $logdest"
     mkdir -p $logdest
-    eos cp $logfile $logdest
+    eos cp $logfile $logdest/$logfile
 elif ! [ -z "$outdest" ]
 then 
     cd ..
     ls -l
     echo "copy $logfile to $outdest"
     mkdir -p $outdest
-    eos cp $logfile\ $outdest
+    eos cp $logfile $outdest/$logfile
 fi
diff --git a/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh b/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh
index 81db602a2c7be2e9430b6d3918a13f3d20d12e10..f7cdf39caf1211bef3e8c5b5231dbd02d845a87f 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh
+++ b/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh
@@ -156,11 +156,11 @@ else
 fi
 cd "$file_stem"
 #
-# Run job, || True ensures script continues even if job fails
+# Run job
 if [[ -z "$tag" ]]; then
-    faser_reco.py "--nevents=$nevents" "$file_path" || True
+    faser_reco.py "--nevents=$nevents" "$file_path" 
 else
-    faser_reco.py "--nevents=$nevents" "--reco=$tag" "$file_path" || True
+    faser_reco.py "--nevents=$nevents" "--reco=$tag" "$file_path" 
 fi
 #
 # Print out ending time
@@ -176,7 +176,9 @@ then
     ls -l
     echo "copy *-RDO.root to $outdest"
     mkdir -p $outdest
-    eos cp *-xAOD.root $outdest || True
+    # Keep this line from stopping script, so we might get a log file
+    # || true ensures script continues even if copy fails
+    eos cp *-xAOD.root ${outdest}/ || true   
 fi
 #
 # Copy log file second
@@ -186,12 +188,12 @@ then
     ls -l
     echo "copy $logfile to $logdest"
     mkdir -p $logdest
-    eos cp $logfile $logdest
+    eos cp $logfile $logdest/$logfile
 elif ! [ -z "$outdest" ]
 then 
     cd ..
     ls -l
     echo "copy $logfile to $outdest"
     mkdir -p $outdest
-    eos cp $logfile\ $outdest
+    eos cp $logfile $outdest/$logfile
 fi
diff --git a/Control/CalypsoExample/Simulation/scripts/submit_faserMDC_simulate.sh b/Control/CalypsoExample/Simulation/scripts/submit_faserMDC_simulate.sh
index bedbb59174d22cb1e263d79be03670d8bba097a1..03b8a836e5c07c336165f5e30a577aafc9aab76b 100755
--- a/Control/CalypsoExample/Simulation/scripts/submit_faserMDC_simulate.sh
+++ b/Control/CalypsoExample/Simulation/scripts/submit_faserMDC_simulate.sh
@@ -199,7 +199,7 @@ then
     ls -l
     echo "copy *-HITS.root to $outdest"
     mkdir -p $outdest
-    eos cp *-HITS.root $outdest
+    eos cp *-HITS.root ${outdest}/ || true
 fi
 #
 # Also copy log file
@@ -209,13 +209,13 @@ then
     ls -l
     echo "copy $logfile to $logdest"
     mkdir -p $logdest
-    eos cp $logfile $logdest
+    eos cp $logfile $logdest/$logfile
 elif ! [ -z "$outdest" ]
 then 
     cd ..
     ls -l
     echo "copy $logfile to $outdest"
     mkdir -p $outdest
-    eos cp $logfile $outdest
+    eos cp $logfile $outdest/$logfile
 fi