Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1035,11 +1035,11 @@
 	       (if (and host pid)
 		   (tasks:kill-server host pid))))
 	   servers)
 
           ;; /tmp/bjbarcla/megatest_localdb/fullrun/.nfs.pdx.disks.icf_env_disk001.bjbarcla.gwa.issues.mtdev.matt-bisect.megatest.ext-tests.runs.all.v1.65.1.6524.dev.bb-24-justrollup-f8.rollup.fullrun/megatest.db.lock
-          (delete-file* (common:get-sync-lock-filepath))
+          (delete-file* (common:get-sync-lock-filepath *alldat*))
           )
 	 
 	 ;; clear out junk records
 	 ;;
 	 ((dejunk)

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -32,13 +32,15 @@
 (declare (uses common))
 (declare (uses db))
 (declare (uses tests))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 (declare (uses server))
-;; (declare (uses daemon))
 (declare (uses portlogger))
 (declare (uses rmt))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "js-path.scm")
 

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -508,11 +508,11 @@
          (sync-log     (or (args:get-arg "-sync-log") (conc *toppath* "/logs/sync-" (current-process-id) "-" (get-host-name) ".log")))
 	 (tmp-area     (common:get-db-tmp-area *alldat*))
 	 (tmp-db       (conc tmp-area "/megatest.db"))
 	 (staging-file (conc *toppath* "/.megatest.db"))
 	 (mtdbfile     (conc *toppath* "/megatest.db"))
-	 (lockfile     (common:get-sync-lock-filepath))
+	 (lockfile     (common:get-sync-lock-filepath *alldat*))
          (sync-cmd-core     (conc sqlite-exe" " tmp-db " .dump | "sqlite-exe" " staging-file "&>"sync-log))
          (sync-cmd     (if fork-to-background 
                            (conc "/usr/bin/env NBFAKE_LOG="*toppath*"/logs/last-server-sync-"(current-process-id)".log nbfake \""sync-cmd-core" && /bin/mv -f " staging-file " " mtdbfile" \"")
                            sync-cmd-core))
          (default-min-intersync-delay 2)