@@ -530,11 +530,11 @@
     (begin
       (set! *didsomething* #t) ;; suppress the help output.
       (if (getenv "MT_TARGET") ;; no point in trying if no target
 	  (if (args:get-arg "-runname")
 	      (let* ((toppath  (launch:setup))
-		     (linktree (if toppath (configf:lookup *configdat* "setup" "linktree")))
+		     (linktree (common:get-linktree)) ;; (if toppath (configf:lookup *configdat* "setup" "linktree")))
 		     (runtop   (conc linktree "/" (getenv "MT_TARGET") "/" (args:get-arg "-runname")))
 		     (files    (if (file-exists? runtop)
 				   (append (glob (conc runtop "/.megatest*"))
 					   (glob (conc runtop "/.runconfig*")))
 				   '())))
@@ -785,12 +785,11 @@
 (if (or (args:get-arg "-list-servers")
 	(args:get-arg "-stop-server")
         (args:get-arg "-kill-server"))
     (let ((tl (launch:setup)))
       (if tl 
-	  (let* ((tdbdat  (tasks:open-db))
-		 (servers (tasks:get-all-servers (db:delay-if-busy tdbdat)))
+	  (let* ((servers (server:get-list *toppath*))
 		 (fmtstr  "~5a~12a~8a~20a~24a~10a~10a~10a~10a\n")
 		 (servers-to-kill '())
                  (kill-switch  (if (args:get-arg "-kill-server") "-9" ""))
                  (killinfo   (or (args:get-arg "-stop-server") (args:get-arg "-kill-server") ))
 		 (khost-port (if killinfo (if (substring-index ":" killinfo)(string-split ":") #f) #f))
@@ -814,15 +813,15 @@
 		      (killed     #f)
 		      (status     (< last-update 20)))
 		 ;;   (zmq-sockets (if status (server:client-connect hostname port) #f)))
 		 ;; no need to login as status of #t indicates we are connecting to correct 
 		 ;; server
-		 (if (equal? state "dead")
-		     (if (> last-update (* 25 60 60)) ;; keep records around for slighly over a day.
-			 (tasks:server-deregister (db:delay-if-busy tdbdat) hostname pullport: pullport pid: pid action: 'delete))
-		     (if (> last-update 20)        ;; Mark as dead if not updated in last 20 seconds
-			 (tasks:server-deregister (db:delay-if-busy tdbdat) hostname pullport: pullport pid: pid)))
+		;; (if (equal? state "dead")
+		;;     (if (> last-update (* 25 60 60)) ;; keep records around for slighly over a day.
+		;; 	 (tasks:server-deregister (db:delay-if-busy tdbdat) hostname pullport: pullport pid: pid action: 'delete))
+		;;     (if (> last-update 20)        ;; Mark as dead if not updated in last 20 seconds
+		;; 	 (tasks:server-deregister (db:delay-if-busy tdbdat) hostname pullport: pullport pid: pid)))
 		 (format #t fmtstr id mt-ver pid hostname (conc interface ":" pullport) pubport last-update
 			 (if status "alive" "dead") transport)
 		 (if (or (equal? id sid)
 			 (equal? sid 0)) ;; kill all/any
 		     (begin
@@ -1183,11 +1182,11 @@
 			       runs-spec)
 			      (newline)))))
 		       
 		     (for-each 
 		      (lambda (test)
-		      	(handle-exceptions
+		      	(common:debug-handle-exceptions #f
 			 exn
 			 (begin
 			   (debug:print-error 0 *default-log-port* "Bad data in test record? " test)
 			   (print "exn=" (condition->list exn))
 			   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))