Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -346,11 +346,11 @@
 
 ;; The watchdog is to keep an eye on things like db sync etc.
 ;;
 (define *watchdog* (make-thread common:watchdog "Watchdog thread"))
 
-;;(thread-start! *watchdog*)
+(thread-start! *watchdog*)
 
 (if (args:get-arg "-log")
     (let ((oup (open-output-file (args:get-arg "-log"))))
       (debug:print-info 0 *default-log-port* "Sending log output to " (args:get-arg "-log"))
       (set! *default-log-port* oup)))
@@ -1982,11 +1982,11 @@
 
 ;;======================================================================
 ;; Exit and clean up
 ;;======================================================================
 
-(if *runremote* (close-all-connections!)) ;; for http-client
+(if (and *runremote* (eq? 'http (remote-transport *runremote*))) (close-all-connections!)) ;; for http-client
 
 (if (not *didsomething*)
     (debug:print 0 *default-log-port* help))
 
 (set! *time-to-exit* #t)