Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -1,7 +1,7 @@
 ;; Always use two digit decimal
 ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00..
 
 (declare (unit megatest-version))
 
-(define megatest-version 1.5104)
+(define megatest-version 1.5105)
 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -326,15 +326,11 @@
 	  (exit)))
     ;; if not list or kill then start a client (if appropriate)
     (if (or (args-defined? "-h" "-version" "-gen-megatest-area" "-gen-megatest-test")
 	    (eq? (length (hash-table-keys args:arg-hash)) 0))
 	(debug:print-info 1 "Server connection not needed")
-	;; ping servers only if -runall -runtests
-	(let ((ping (args-defined? "-runall" "-runtests" "-remove-runs" 
-				   "-set-state-status" "-rerun" "-rollup" "-lock" "-unlock"
-				   "-set-values" "-list-runs" "-repl")))
-	  (server:client-launch do-ping: ping))))
+	(server:client-launch do-ping: #t)))
 
 ;;======================================================================
 ;; Remove old run(s)
 ;;======================================================================
 
@@ -876,12 +872,12 @@
     (let* ((toppath (setup-for-run))
 	   (db      (if toppath (open-db) #f)))
       (if db
 	  (begin
 	    (set! *db* db)
-	    (if (not (args:get-arg "-server"))
-		(server:client-setup))
+	    (set! *client-non-blocking-mode* #t)
+	    ;; (server:client-setup)
 	    (import readline)
 	    (import apropos)
 	    (gnu-history-install-file-manager
 	     (string-append
 	      (or (get-environment-variable "HOME") ".") "/.megatest_history"))