Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -1216,13 +1216,15 @@
       
       ;; well, first lets see if cpu load throttling is enabled. If so wait around until the
       ;; average cpu load is under the threshold before continuing
 
       ;; jobtools maxload is useful for where the full Megatest run is done on one machine
-      (if maxload ;; only gate if maxload is specified, NOTE: maxload is normalized, i.e. load=1 means all cpus fully utilized
+      (if (and (not (common:on-homehost?))
+	       maxload) ;; only gate if maxload is specified, NOTE: maxload is normalized, i.e. load=1 means all cpus fully utilized
           (common:wait-for-normalized-load maxload "Waiting for load to drop before starting more tests" #f))
 
+      
       ;; jobtools maxhomehostload is intended to prevent overloading on the homehost which can cause database corruption issues
       (if maxhomehostload
           (common:wait-for-homehost-load maxhomehostload
 					 (conc "Waiting for homehost load to drop below normalized value of " maxhomehostload)))
       

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -324,11 +324,11 @@
 ;;
 (define (server:wait-for-server-start-last-flag areapath)
   (let* ((start-flag (conc areapath "/logs/server-start-last")))
     (if (file-exists? start-flag)
 	(let* ((fmodtime (file-modification-time start-flag))
-	       (reftime  3) ;; (+ 2 (random 3)))
+	       (reftime  3) ;; (+ 2 (random 3))) ;;; THIS INTERACTS WITH [server] timeout. Suggest using 0.1 or above
 	       (delta    (- (current-seconds) fmodtime))
 	       (all-go   (> delta reftime)))
 	  (if all-go
 	      #t ;; (system (conc "touch " start-flag)) ;; lazy but safe
 	      (begin