Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -933,21 +933,10 @@
 		  (debug:print-error 0 *default-log-port* "Unable to find megatest home directory.")
 		  #f)
 		(loop (pathname-directory thepath)))))
       ))
 
-
-(define (common:db-tmp-area-path)
-  (conc "/tmp/" 
-         (current-user-name)
-	 "/megatest_localdb/"
-	 (common:get-testsuite-name)
-         "/"
-	 (string-translate *toppath* "/" ".")
-  )
-)
-
 
 ;;======================================================================
 ;; redefine for future cleanup (converge on area-name, the more generic
 ;;
 (define common:get-area-name common:get-testsuite-name)
@@ -967,11 +956,11 @@
 			      (list (conc "/tmp/" (current-user-name)
 					  "/megatest_localdb/"
 					  tsname "/"
 					  (string-translate toppath "/" "."))
 				    (conc "/tmp/" (current-process-id) ;; just in case we have an issue with the dir by own user name
-					  "/megatest_localdb/"
+					  "/"(current-user-name) "/megatest_localdb/"
 					  tsname
 					  (string-translate toppath "/" "."))
 				    ))))
 		(set! *db-cache-path* dbpath)
 		;; ensure megatest area has .mtdb

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -166,17 +166,21 @@
 ;; dot-locking egg seems not to work, using this for now
 ;; if lock is older than expire-time then remove it and try again
 ;; to get the lock
 ;;
 (define (common:simple-file-lock fname #!key (expire-time 300))
-  (let ((fmod-time (handle-exceptions
-		       ext
-		     (current-seconds)
-		     (file-modification-time fname))))
-    (if (file-exists? fname) ;; (common:file-exists? fname)
+  (let* ((lock-exists (file-exists? fname))
+	 (fmod-time (if lock-exists
+			(current-seconds)
+			(handle-exceptions
+			 ext
+			 (current-seconds)
+			 (file-modification-time fname)))))
+    (if lock-exists
 	(if (> (- (current-seconds) fmod-time) expire-time)
 	    (begin
+	      (debug:print-info 1 *default-log-port* "Removing stale lock "fname)
 	      (handle-exceptions exn #f (delete-file* fname))	
 	      (common:simple-file-lock fname expire-time: expire-time))
 	    #f)
 	(let ((key-string (conc (get-host-name) "-" (current-process-id))))
 	  (with-output-to-file fname

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -117,11 +117,12 @@
 		 args:arg-hash
 		 0))
 
 (if (args:get-arg "-mode")
     (let* ((mode (string->symbol (args:get-arg "-mode"))))
-      (rmt:transport-mode mode)))
+      (rmt:transport-mode mode))
+    (rmt:transport-mode 'tcp))
 
 (if (args:get-arg "-test") ;; need to use tcp for test control panel
     (rmt:transport-mode 'tcp))
 
 ;; RA => Might require revert for filters 
@@ -697,12 +698,12 @@
 	 (last-db-time (if do-not-use-db-file-timestamps
 			   0
 			   (dboard:rundat-last-db-time run-dat)))
 	 (db-path      (or (dboard:rundat-db-path run-dat)
 			   (let* ((db-dir (get-environment-variable "MT_RUN_AREA_HOME")) ;;  (common:get-db-tmp-area))
-				  (db-pth (conc db-dir "/.mtdb/main.db")))
-			     (dboard:rundat-db-path-set! run-dat db-pth)
+				  (db-pth (conc db-dir "/.mtdb/*.db")))
+			     (dboard:rundat-db-path-set! run-dat db-pth) ;; this is just a cache of the path
 			     db-pth)))
 	 (db-mod-time  (common:lazy-sqlite-db-modification-time db-path))
 	 (db-modified  (>= db-mod-time last-db-time))
 	 (multi-get    (> (dboard:rundat-run-data-offset run-dat) 0))  ;; multi-get in progress
 	 (tmptests     (if (or do-not-use-db-file-timestamps

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -562,11 +562,12 @@
 	 (old2new (member 'old2new options))
 	 (dejunk (member 'dejunk options))
 	 (killservers (member 'killservers options))
 	 (src-area (if old2new *toppath* tmp-area))
 	 (dest-area (if old2new tmp-area *toppath*))
-	 (dbfiles        (if old2new (glob (conc *toppath* "/.mtdb/*.db")) (glob (conc tmp-area "/.mtdt/*.db"))))
+	 (dbfiles        (if old2new (glob (conc *toppath* "/.mtdb/*.db"))
+			     (glob (conc tmp-area "/.mtdb/*.db"))))
 	 (keys (db:get-keys dbstruct))
 	 (sync-durations (make-hash-table)))
 
     ;; kill servers
     (if killservers (db:kill-servers))