@@ -46,13 +46,17 @@
 (declare (uses vg))
 (declare (uses subrun))
 ;; (declare (uses dashboard-main))
 (declare (uses megatest-version))
 (declare (uses mt))
+
 (declare (uses commonmod))
 (import commonmod)
-
+(declare (uses rmtmod))
+(import rmtmod)
+(declare (uses dbmod))
+(import dbmod)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")
@@ -103,10 +107,16 @@
 			"-repl"
                         "-rh5.11" ;; fix to allow running on rh5.11
 			)
 		 args:arg-hash
 		 0))
+
+;; (set! *functions* dbmod#*functions*)
+;; (set! apimod#*functions* dbmod#*functions*)
+;; (set! configfmod#*functions* dbmod#*functions*)
+
+(include "migrate-fix.scm")
 
 ;; check for MT_* environment variables and exit if found
 (if (not (args:get-arg "-test"))
     (begin
       (display "Checking for MT_ vars: ")