Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -584,7 +584,7 @@
   (rmt:send-receive 'find-task-queue-records #f (list target run-name test-patt state-patt action-patt)))
 
 (define (rmt:tasks-add action owner target runname testpatt params)
   (rmt:send-receive 'tasks-add #f (list action owner target runname testpatt params)))
 
-(define (rmt:tasks-set-state-given-param-key dbstruct param-key new-state)
+(define (rmt:tasks-set-state-given-param-key param-key new-state)
   (rmt:send-receive 'tasks-set-state-given-param-key #f (list  param-key new-state)))

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -223,17 +223,17 @@
     (set-signal-handler! signal/int
 			 (lambda (signum)
 			   (signal-mask! signum)
 			   (print "Received signal " signum ", cleaning up before exit. Please wait...")
 			   (let ((tdbdat (tasks:open-db)))
-			     (tasks:set-state-given-param-key (db:delay-if-busy tdbdat) task-key "killed"))
+			     (rmt:tasks-set-state-given-param-key task-key "killed"))
 			   (print "Killed by signal " signum ". Exiting")
 			   (exit)))
 
     ;; register this run in monitor.db
     (rmt:tasks-add "run-tests" user target runname test-patts task-key) ;; params)
-    (rmt:tasks-set-state-given-param-key (db:delay-if-busy tdbdat) task-key "running")
+    (rmt:tasks-set-state-given-param-key task-key "running")
     (runs:set-megatest-env-vars run-id inkeys: keys inrunname: runname) ;; these may be needed by the launching process
     (if (file-exists? runconfigf)
 	(setup-env-defaults runconfigf run-id *already-seen-runconfig-info* keyvals target)
 	(debug:print 0 "WARNING: You do not have a run config file: " runconfigf))
 

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -722,11 +722,11 @@
 ;; kill any runner processes (i.e. processes handling -runtests) that match target/runname
 ;; 
 ;; do a remote call to get the task queue info but do the killing as self here.
 ;;
 (define (tasks:kill-runner target run-name)
-  (let ((records    (rmt:find-task-queue-records target run-name "%" "running" "run-tests"))
+  (let ((records    (rmt:tasks-find-task-queue-records target run-name "%" "running" "run-tests"))
 	(hostpid-rx (regexp "\\s+(\\w+)\\s+(\\d+)$"))) ;; host pid is at end of param string
     (if (null? records)
 	(debug:print 0 "No run launching processes found for " target " / " run-name)
 	(debug:print 0 "Found " (length records) " run(s) to kill."))
     (for-each