@@ -591,13 +591,13 @@
 ;;
 (define (common:exit-on-version-changed)
   (if (common:on-homehost?)
       (if (common:api-changed?)
 	  (let* ((mtconf (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.config"))
-                (dbfile  (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db"))
-                (read-only (not (file-write-access? dbfile)))
-                (dbstruct (db:setup #t)))
+                 (dbfile  (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db"))
+                 (read-only (not (file-write-access? dbfile)))
+                 (dbstruct (db:setup-db *dbstruct-dbs* *toppath* #f))) ;;  #t)))
 	    (debug:print 0 *default-log-port*
 			 "WARNING: Version mismatch!\n"
 			 "   expected: " (common:version-signature) "\n"
 			 "   got:      " (common:get-last-run-version))
             (cond
@@ -983,10 +983,14 @@
 		(set! *db-cache-path* dbpath)
 		;; ensure megatest area has .db
 		(let ((dbarea (conc *toppath* "/.db")))
 		  (if (not (file-exists? dbarea))
 		      (create-directory dbarea)))
+		;; ensure tmp area has .db
+		(let ((dbarea (conc dbpath "/.db")))
+		  (if (not (file-exists? dbarea))
+		      (create-directory dbarea)))
 		dbpath))
 	  #f)))
 
 (define (common:get-area-path-signature)
   (message-digest-string (md5-primitive) *toppath*))
@@ -1041,11 +1045,11 @@
 ;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
 (define (common:watchdog)
   (debug:print-info 13 *default-log-port* "common:watchdog entered.")
   (if (launch:setup)
       (if (common:on-homehost?)
-	  (let ((dbstruct (db:setup #t)))
+	  (let ((dbstruct (db:setup-db *dbstruct-dbs* *toppath* #f))) ;;  #t)))
 	    (debug:print-info 13 *default-log-port* "after db:setup with dbstruct=" dbstruct)
 	    (cond
 	     ((dbr:dbstruct-read-only dbstruct)
 	      (debug:print-info 13 *default-log-port* "loading read-only watchdog")
 	      (common:readonly-watchdog dbstruct))
@@ -1077,11 +1081,11 @@
 			 #t))))
     (debug:print-info 4 *default-log-port* "starting exit process, finalizing databases.")
     (if (and no-hurry (debug:debug-mode 18))
 	(rmt:print-db-stats))
     (let ((th1 (make-thread (lambda () ;; thread for cleaning up, give it five seconds
-                              (if *dbstruct-db* (db:close-all *dbstruct-db*)) ;; one second allocated
+                              (if *dbstruct-dbs* (db:close-all *dbstruct-dbs*)) ;; one second allocated
 			      (if *task-db*    
 				  (let ((db (cdr *task-db*)))
 				    (if (sqlite3:database? db)
 					(begin
 					  (sqlite3:interrupt! db)