Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -65,12 +65,12 @@
     get-run-info
     get-run-status
     get-run-state
     get-run-stats
     get-run-times
-    get-targets
     get-target
+    get-targets
     ;; register-run
     get-tests-tags
     get-test-times
     get-tests-for-run
     get-tests-for-run-state-status

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -4761,11 +4761,12 @@
 					  (set! *task-db* #f)))))
 			      (if (and *no-sync-db*
 				       (sqlite3:database? *no-sync-db*))
 				  (sqlite3:finalize! *no-sync-db* #t))
 			      (if (and (not (args:get-arg "-server"))
-				       *runremote*)
+				       *runremote*
+				       (eq? (rmt:transport-mode) 'http))
 				  (begin
 				    (debug:print-info 0 *default-log-port* "Closing all client connections...")
 				    (http-transport:close-connections *runremote*)
 				    #;(http-client#close-all-connections!)))
                               ;; (if (and *runremote*

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -502,11 +502,11 @@
 (define (rmt:get-targets)
   (rmt:send-receive 'get-targets #f '()))
 
 (define (rmt:get-target run-id)
   (assert (number? run-id) "FATAL: Run id required.")
-  (rmt:send-receive 'get-target run-id (list run-id)))
+  (rmt:send-receive 'get-target #f (list run-id)))
 
 (define (rmt:get-run-times runpatt targetpatt)
   (rmt:send-receive 'get-run-times #f (list runpatt targetpatt )))