Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -81,11 +81,11 @@
     tasks-get-last
     testmeta-get-record
     have-incompletes?
     ;; synchash-get
     get-changed-record-ids
-		get-run-record-ids 
+    get-run-record-ids 
     get-not-completed-cnt))
 
 (define api:write-queries
   '(
     get-keys-write ;; dummy "write" query to force server start
@@ -99,11 +99,11 @@
     delete-test-records
     delete-old-deleted-test-records
     test-set-state-status
     test-set-top-process-pid
     set-state-status-and-roll-up-items
-     
+    
     update-pass-fail-counts
     top-test-set-per-pf-counts ;; (db:top-test-set-per-pf-counts (db:get-db *db* 5) 5 "runfirst")
 
     ;; RUNS
     register-run
@@ -243,11 +243,11 @@
 		   ;; NO SYNC DB
 		   ((no-sync-set)               (apply db:no-sync-set         *no-sync-db* params))
 		   ((no-sync-get/default)       (apply db:no-sync-get/default *no-sync-db* params))
 		   ((no-sync-del!)              (apply db:no-sync-del!        *no-sync-db* params))
 		   ((no-sync-get-lock)          (apply db:no-sync-get-lock    *no-sync-db* params))
-		 
+		   
                    ;; ARCHIVES
                    ;; ((archive-get-allocations)   
                    ((archive-register-disk)     (apply db:archive-register-disk dbstruct params))
                    ((archive-register-block-name)(apply db:archive-register-block-name dbstruct params))
                    ;; ((archive-allocate-testsuite/area-to-block)(apply db:archive-allocate-testsuite/area-to-block dbstruct block-id testsuite-name areakey))

Index: pkts/pkts.scm
==================================================================
--- pkts/pkts.scm
+++ pkts/pkts.scm
@@ -621,11 +621,11 @@
 ;;
 (define (open-queue-db dbpath dbfile #!key (schema '()))
   (let* ((dbfname  (conc dbpath "/" dbfile))
 	 (dbexists (if (file-exists? dbfname) #t (begin (create-directory dbpath #t) #f)))
 	 (db       (dbi:open 'sqlite3 (list (cons 'dbname dbfname)))))
-    ;; (set-busy-handler! db (busy-timeout 10000))
+    ;; (set-busy-handler! (dbi:db-conn db) (busy-timeout 10000))
     (if (not dbexists) ;; NOTE: In the archive we allow duplicates and other messiness. 
 	(for-each
 	 (lambda (stmt)
 	   (dbi:exec db stmt))
 	 (cons "CREATE TABLE IF NOT EXISTS pkts