@@ -651,11 +651,11 @@
     (let ((tl        (launch:setup-for-run *area-dat*))
 	  (run-id    (and (args:get-arg "-run-id")
 			  (string->number (args:get-arg "-run-id")))))
       (if run-id
 	  (begin
-	    (server:launch run-id)
+	    (server:launch run-id *area-dat*)
 	    (set! *didsomething* #t))
 	  (debug:print 0 "ERROR: server requires run-id be specified with -run-id")))
 
     ;; Not a server? This section will decide how to communicate
     ;;
@@ -688,11 +688,11 @@
 
 (if (or (args:get-arg "-list-servers")
 	(args:get-arg "-stop-server"))
     (let ((tl (launch:setup-for-run *area-dat*)))
       (if tl 
-	  (let* ((tdbdat  (tasks:open-db))
+	  (let* ((tdbdat  (tasks:open-db *area-dat*))
 		 (servers (tasks:get-all-servers (db:delay-if-busy tdbdat)))
 		 (fmtstr  "~5a~12a~8a~20a~24a~10a~10a~10a~10a\n")
 		 (servers-to-kill '())
 		 (killinfo   (args:get-arg "-stop-server"))
 		 (khost-port (if killinfo (if (substring-index ":" killinfo)(string-split ":") #f) #f))
@@ -1051,11 +1051,11 @@
    (lambda (target runname keys keyvals)
      ;;
      ;; May or may not implement it this way ...
      ;;
      ;; Insert this run into the tasks queue
-     ;; (open-run-close tasks:add tasks:open-db 
+     ;; (open-run-close tasks:add (lambda ()(tasks:open-db *area-dat*))
      ;;    	     "runtests" 
      ;;    	     user
      ;;    	     target
      ;;    	     runname
      ;;    	     (args:get-arg "-runtests")