@@ -379,23 +379,23 @@
 ;;      (else
 ;;       #f))))
 
 ;; try to start a server and wait for it to be available
 ;;
-(define (tasks:start-and-wait-for-server tdbdat run-id delay-max-tries)
+(define (tasks:start-and-wait-for-server tdbdat run-id delay-max-tries area-dat)
   ;; ensure a server is running for this run
-  (let loop ((server-dat (tasks:get-server (db:delay-if-busy tdbdat) run-id))
+  (let loop ((server-dat (tasks:get-server (db:delay-if-busy tdbdat area-dat) run-id))
 	     (delay-time 0))
       (if (and (not server-dat)
 	       (< delay-time delay-max-tries))
 	  (begin
 	    (if (common:low-noise-print 60 "tasks:start-and-wait-for-server" run-id)
 		(debug:print 0 "Try starting server for run-id " run-id))
 	    (thread-sleep! (/ (random 2000) 1000))
 	    (server:kind-run run-id)
 	    (thread-sleep! (min delay-time 1))
-	    (loop (tasks:get-server (db:delay-if-busy tdbdat) run-id)(+ delay-time 1))))))
+	    (loop (tasks:get-server (db:delay-if-busy tdbdat area-dat) run-id)(+ delay-time 1))))))
 
 (define (tasks:get-all-servers mdb)
   (let ((res '()))
     (sqlite3:for-each-row
      (lambda (id pid hostname interface port pubport start-time priority state mt-version last-update transport run-id)
@@ -430,19 +430,19 @@
  
 ;; look up a server by run-id and send it a kill, also delete the record for that server
 ;;
 (define (tasks:kill-server-run-id run-id area-dat #!key (tag "default"))
   (let* ((tdbdat  (tasks:open-db area-dat))
-	 (sdat    (tasks:get-server (db:delay-if-busy tdbdat) run-id)))
+	 (sdat    (tasks:get-server (db:delay-if-busy tdbdat area-dat) run-id)))
     (if sdat
 	(let ((hostname (vector-ref sdat 6))
 	      (pid      (vector-ref sdat 5))
 	      (server-id (vector-ref sdat 0)))
-	  (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "killed")
+	  (tasks:server-set-state! (db:delay-if-busy tdbdat area-dat) server-id "killed")
 	  (debug:print-info 0 "Killing server " server-id " for run-id " run-id " on host " hostname " with pid " pid)
 	  (tasks:kill-server hostname pid)
-	  (tasks:server-delete-record (db:delay-if-busy tdbdat) server-id tag) )
+	  (tasks:server-delete-record (db:delay-if-busy tdbdat area-dat) server-id tag) )
 	(debug:print-info 0 "No server found for run-id " run-id ", nothing to kill"))
     ;; (sqlite3:finalize! tdb)
     ))
     
 ;;======================================================================
@@ -698,16 +698,16 @@
       (sqlite3:first-row db "SELECT id,action,owner,state,target,name,testpatt,keylock,params WHERE
                                params LIKE ? AND state LIKE ? AND action LIKE ? AND testpatt LIKE ?;"
 			 param-key state-patt action-patt test-patt)))))
 
 
-(define (tasks:find-task-queue-records dbstruct target run-name test-patt state-patt action-patt)
+(define (tasks:find-task-queue-records dbstruct area-dat target run-name test-patt state-patt action-patt)
   ;; (handle-exceptions
   ;;  exn
   ;;  '()
   ;;  (sqlite3:first-row
-  (let ((db (db:delay-if-busy (db:get-db dbstruct #f)))
+  (let ((db (db:delay-if-busy (db:get-db dbstruct #f) area-dat))
 	(res '()))
     (sqlite3:for-each-row 
      (lambda (a . b)
        (set! res (cons (cons a b) res)))
      db "SELECT id,action,owner,state,target,name,testpatt,keylock,params FROM tasks_queue