@@ -17,11 +17,11 @@
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
 ;; (use zmq)
 
 (import (prefix sqlite3 sqlite3:))
 
-(use spiffy uri-common intarweb http-client spiffy-request-vars uri-common intarweb)
+(use spiffy uri-common intarweb http-client spiffy-request-vars uri-common intarweb directory-utils)
 
 (declare (unit client))
 
 (declare (uses common))
 (declare (uses db))
@@ -60,11 +60,11 @@
   (if (not *toppath*)
       (if (not (setup-for-run))
 	  (begin
 	    (debug:print 0 "ERROR: failed to find megatest.config, exiting")
 	    (exit))))
-  (change-directory *toppath*) ;; This is probably NOT needed 
+  (push-directory *toppath*) ;; This is probably NOT needed 
   (debug:print-info 11 "*transport-type* is " *transport-type* ", *runremote* is " *runremote*)
   (let* ((hostinfo  (if (not *transport-type*) ;; If we dont' already have transport type set then figure it out
 			(open-run-close tasks:get-best-server tasks:open-db)
 			#f)))
     ;; if have hostinfo then extract the transport type 
@@ -96,11 +96,12 @@
 				     (tasks:hostinfo-get-port      hostinfo)
 				     (tasks:hostinfo-get-pubport   hostinfo)))
       (else  ;; default to fs
        (debug:print 0 "ERROR: unrecognised transport type " *transport-type* " attempting to continue with fs")
        (set! *transport-type* 'fs)
-       (set! *megatest-db*    (open-db))))))
+       (set! *megatest-db*    (open-db))))
+    (pop-directory)))
 
 ;; client:signal-handler
 (define (client:signal-handler signum)
   (handle-exceptions
    exn