Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -1822,11 +1822,11 @@
 		    new-best)
 		  (if (null? tal) #f (loop (car tal)(cdr tal) best-host)))))))))
 
 (define (common:wait-for-cpuload maxload-in numcpus-in waitdelay #!key (count 1000) (msg #f)(remote-host #f)(force-maxload #f))
   (let* ((loadavg (common:get-cpu-load remote-host))
-	 (numcpus (if (< 1 numcpus-in) ;; not possible
+	 (numcpus (if (<= 1 numcpus-in) ;; not possible to have zero.  If we get 1, it's possible that we got the previous default, and we should check again
 		      (common:get-num-cpus remote-host)
 		      numcpus-in))
 	 (maxload (if force-maxload
 		      maxload-in
 		      (max maxload-in 0.5))) ;; so maxload must be greater than 0.5 for now BUG - FIXME?

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -230,12 +230,24 @@
            (let ((db      (sqlite3:open-database fname)))
              (sqlite3:set-busy-handler! db (make-busy-timeout 136000))
              (sqlite3:execute db "PRAGMA synchronous = 0;")
              (if (not file-exists)
                  (begin
-                   
-                   (if (and (configf:lookup *configdat* "setup" "use-wal")
+                   (if (and (configf:lookup *configdat* "setup" "tmp_mode") (string-match "^/tmp/.*" fname))
+                      (begin
+                       (print "DEBUG: Setting tmp_mode for " fname) 
+                       (sqlite3:execute db (configf:lookup *configdat* "setup" "tmp_mode"))
+                      )
+                   )  
+                   (if (and (configf:lookup *configdat* "setup" "nfs_mode") (not (string-match "^/tmp/.*" fname)))
+                       (begin
+                        (print "DEBUG: Setting nfs_mode for " fname)
+                        (sqlite3:execute db (configf:lookup *configdat* "setup" "nfs_mode"))
+                       )
+                   )  
+                   (if (and (not (or (configf:lookup *configdat* "setup" "tmp_mode") (configf:lookup *configdat* "setup" "nfs_mode")))  
+                            (configf:lookup *configdat* "setup" "use-wal")
                             (string-match "^/tmp/.*" fname)) ;; this is a file in /tmp
                        (sqlite3:execute db "PRAGMA journal_mode=WAL;")
                        (debug:print 2 *default-log-port* "Creating " fname " in NON-WAL mode."))
                    (initproc db)))
              (if (not readyexists)

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -1024,13 +1024,14 @@
                              ;;             (area-allowed? area "area-needs-to-be-run" runkey contour #f))))
 			    ;;(print "Area Allowed: " (area-allowed? area "area-needs-to-be-run" runkey contour #f))
 ;Add code to check whether area is valid
 			     (if 
                    ;; This code checks whether the target has been passed in via argument, and only runs the specified target
-                   (and (< packets-generated (or (string->number (if (configf:lookup mtconf "setup" "max_packets_per_run") (configf:lookup mtconf "setup" "max_packets_per_run") "10000" )) 10000))  (if (args:get-arg "-target") 
-                     (if (string= (args:get-arg "-target") runkey) (area-allowed? area "area-needs-to-be-run" runkey contour #f) #f) 
-                     (area-allowed? area "area-needs-to-be-run" runkey contour #f)))
+                   (and (< packets-generated (or (string->number (if (configf:lookup mtconf "setup" "max_packets_per_run") (configf:lookup mtconf "setup" "max_packets_per_run") "10000" )) 10000))  
+                        (if (args:get-arg "-target") 
+                            (if (string= (args:get-arg "-target") runkey) (area-allowed? area "area-needs-to-be-run" runkey contour #f) #f) 
+                                (area-allowed? area "area-needs-to-be-run" runkey contour #f)))
        
 			     (let* ((script (car cmd))
 				(params (cdr cmd))
 				(cmd    (conc script " " contour " " area " " runkey " " std-runname " " action " " params))
 				(res    (handle-exceptions

Index: subrun.scm
==================================================================
--- subrun.scm
+++ subrun.scm
@@ -135,11 +135,11 @@
       (subrun:unset-subrun-removed test-run-dir))      
 
   (let* ((log-prefix "run")
          (switches (subrun:selector+log-switches test-run-dir log-prefix))
          (run-wait #t)
-         (cmd      (conc "megatest -run "switches" "
+         (cmd      (conc "megatest -rerun-clean "switches" "
                          (if run-wait "-run-wait " ""))))
     cmd))
 
 
 (define (subrun:sanitize-path inpath)