diff --git a/BayesWaveUtils/bayeswave_pipe/bayeswave_pipe_utils.py b/BayesWaveUtils/bayeswave_pipe/bayeswave_pipe_utils.py
index 05eafee90cd140db612e83ead1e319b03f36d188..49d7b1e6015cd9e93a29aee7a0e8d5b11c743f6b 100644
--- a/BayesWaveUtils/bayeswave_pipe/bayeswave_pipe_utils.py
+++ b/BayesWaveUtils/bayeswave_pipe/bayeswave_pipe_utils.py
@@ -971,7 +971,7 @@ def condor_job_config(job_type, condor_job, config_parser):
             # "Delayed Transfers" (strongly discouraged)
             # condor_job.add_condor_cmd('+WantCheckpointSignal', True)
             # condor_job.add_condor_cmd('+CheckpointSig', '"SIGINT"')
-            # condor_job.add_condor_cmd('when_to_transfer_output', 'ON_EXIT_OR_EVICT')
+            condor_job.add_condor_cmd('when_to_transfer_output', 'ON_EXIT_OR_EVICT')
         else:
             condor_job.add_condor_cmd('when_to_transfer_output', 'ON_EXIT')
 
@@ -998,7 +998,10 @@ def condor_job_config(job_type, condor_job, config_parser):
         # --- Force downstream jobs to run locally
         if job_type in ['bayeswave_post', 'bayeswave_fpeak', 'bayeswave_clean_frame',
                          'megaplot.py', 'megasky.py']:
-            requires.append("(GLIDEIN_SITE=?=undefined)")
+            #requires.append("(GLIDEIN_SITE=?=undefined)")
+            condor_job.add_condor_cmd('+flock_local', 'True')
+            condor_job.add_condor_cmd('+DESIRED_Sites', '\"nogrid\"')
+
         else:
             try:
                 condor_job.add_condor_cmd('+DESIRED_Sites',