@@ -202,16 +202,17 @@
 	 (serverdat   (list iface port)))
     (set! login-res (client:login serverdat))
     (if (and (not (null? login-res))
 	     (car login-res))
 	(begin
-	  (debug:print-info 2 "Logged in and connected to " iface ":" port)
+	  (debug:print-info 0 "Logged in and connected to " iface ":" port)
 	  (set! *runremote* serverdat)
 	  serverdat)
 	(begin
-	  (debug:print-info 2 "Failed to login or connect to " iface ":" port)
+	  (debug:print-info 0 "Failed to login or connect to " iface ":" port)
 	  (set! *runremote* #f)
+	  (set! *transport-type* 'fs)
 	  #f))))
 
 
 ;; run http-transport:keep-running in a parallel thread to monitor that the db is being 
 ;; used and to shutdown after sometime if it is not.
@@ -231,17 +232,18 @@
                                 (loop))))))
          (iface       (car server-info))
          (port        (cadr server-info))
          (last-access 0)
 	 (tdb         (tasks:open-db))
-	 (spid        (tasks:server-get-server-id tdb #f iface port #f))
+	 (spid        ;;(open-run-close tasks:server-get-server-id tasks:open-db #f iface port #f))
+	   (tasks:server-get-server-id tdb #f iface port #f))
 	 (server-timeout (let ((tmo (config-lookup  *configdat* "server" "timeout")))
 			   (if (and (string? tmo)
 				    (string->number tmo))
 			       (* 60 60 (string->number tmo))
 			       ;; default to three days
-			       (* 3 24 60)))))
+			       (* 3 24 60 60)))))
     (debug:print-info 2 "server-timeout: " server-timeout ", server pid: " spid " on " iface ":" port)
     (let loop ((count 0))
       (thread-sleep! 4) ;; no need to do this very often
       ;; NB// sync currently does NOT return queue-length
       (let () ;; (queue-len (cdb:client-call server-info 'sync #t 1)))
@@ -252,18 +254,20 @@
 	;; Check that iface and port have not changed (can happen if server port collides)
 	(mutex-lock! *heartbeat-mutex*)
 	(set! sdat *runremote*)
 	(mutex-unlock! *heartbeat-mutex*)
 
-	(if (not (equal? sdat (list iface port)))
+	(if (or (not (equal? sdat (list iface port)))
+		(not spid))
 	    (begin 
-	      (debug:print-info 1 "interface changed, refreshing iface and port info")
+	      (debug:print-info 0 "interface changed, refreshing iface and port info")
 	      (set! iface (car sdat))
 	      (set! port  (cadr sdat))
 	      (set! spid  (tasks:server-get-server-id tdb #f iface port #f))))
 
         ;; NOTE: Get rid of this mechanism! It really is not needed...
+        ;; (open-run-close tasks:server-update-heartbeat tasks:open-db spid)
         (tasks:server-update-heartbeat tdb spid)
       
         ;; (if ;; (or (> numrunning 0) ;; stay alive for two days after last access
         (mutex-lock! *heartbeat-mutex*)
         (set! last-access *last-db-access*)
@@ -276,11 +280,11 @@
               (loop 0))
             (begin
               (debug:print-info 0 "Starting to shutdown the server.")
               ;; need to delete only *my* server entry (future use)
               (set! *time-to-exit* #t)
-              (tasks:server-deregister-self tdb (get-host-name))
+              (open-run-close tasks:server-deregister-self tasks:open-db (get-host-name))
               (thread-sleep! 1)
               (debug:print-info 0 "Max cached queries was    " *max-cache-size*)
 	      (debug:print-info 0 "Number of cached writes   " *number-of-writes*)
 	      (debug:print-info 0 "Average cached write time "
 				(if (eq? *number-of-writes* 0)
@@ -329,10 +333,12 @@
 	    (debug:print 0 "ERROR: Failed to setup for megatest")))
     (exit)))
 
 ;; (use trace)
 ;; (trace http-transport:keep-running 
+;;        tasks:server-update-heartbeat
+;;        tasks:server-get-server-id)
 ;;        tasks:get-best-server
 ;;        http-transport:run
 ;;        http-transport:launch
 ;;        http-transport:try-start-server
 ;;        http-transport:client-send-receive