Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -32,13 +32,15 @@
 (declare (uses db))
 (declare (uses rmtmod))
 (declare (uses ezsteps))
 ;; (declare (uses dbmod))
 (declare (uses dbfile))
+(declare (uses dbmod))
 (declare (uses mtargs))
 (declare (uses mtmod))
 (declare (uses megatestmod))
+(declare (uses tasksmod))
 
 (use regex regex-case base64 sqlite3 srfi-18 directory-utils posix posix-extras z3
      call-with-environment-variables csv hostinfo 
      typed-records pathname-expand matchable)
 
@@ -55,14 +57,15 @@
 (import commonmod
 	processmod
 	configfmod
 	rmtmod
 	debugprint
-	;; dbmod
+	dbmod
 	dbfile
 	mtmod
 	megatestmod
+	tasksmod
 	)
 
 ;;======================================================================
 ;; ezsteps
 ;;======================================================================

Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -942,17 +942,20 @@
 
 ;;======================================================================
 ;;  S U P P O R T   F U N C T I O N S
 ;;======================================================================
 
-(define (rmt:on-homehost? runremote)
-  (let* ((hh-dat (remote-hh-dat runremote)))
-    (if (pair? hh-dat)
-	(cdr hh-dat)
-	(begin
-	  (debug:print-info 0 *default-log-port* "hh-dat="hh-dat)
-	  #f))))
+(define (rmt:on-homehost? #!optional (runremote-in #f))
+  (let* ((runremote (or runremote-in *runremote*)))
+    (if runremote
+	(let* ((hh-dat (remote-hh-dat runremote)))
+	  (if (pair? hh-dat)
+	      (cdr hh-dat)
+	      (begin
+		(debug:print-info 0 *default-log-port* "hh-dat="hh-dat)
+		#f)))
+	#f))) ;; not true strickly speaking, might be runremote was not yet initialized.
 
 (define (make-and-init-remote areapath)
    (case (rmt:transport-mode)
      ((http)(make-remote))
      ((tcp) (tt:make-remote areapath))

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -23,11 +23,15 @@
 (declare (uses processmod))
 (declare (uses configfmod))
 (declare (uses mtargs))
 (declare (uses rmtmod))
 (declare (uses dbfile))
+(declare (uses dbmod))
 (declare (uses megatestmod))
+(declare (uses mtmod))
+(declare (uses tasksmod))
+(declare (uses servermod))
 
 (declare (uses db))
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
@@ -54,12 +58,17 @@
 	processmod
 	configfmod
 	debugprint
 	rmtmod
 	dbfile
+	dbmod
 	megatestmod
-	(prefix mtargs args:))
+	(prefix mtargs args:)
+	mtmod
+	tasksmod
+	servermod
+	)
 
 ;; use this struct to facilitate refactoring
 ;;
 
 (defstruct runs:dat

Index: utils/plot-uses.scm
==================================================================
--- utils/plot-uses.scm
+++ utils/plot-uses.scm
@@ -81,11 +81,11 @@
 	  (print "// Filename: "fname)
 	  (process-file ignores fname))
 	files)
        (print "}")))
     (else
-     (print-err "Usage: plot-uses u1,u2... file1.scm ...")
+     (print-err "Usage: plot-uses todot u1,u2... file1.scm ...")
      (print-err "    where u1,u2... are units to ignore and file1.scm... are the files to process."))))
 
 (main)
 
 )