@@ -1219,11 +1219,11 @@
 							       (iup:attribute-set! obj "TITLE" (if *hide-not-hide* "HideTests" "NotHide"))
 							       (mark-for-update)))))
 		(set! *hide-not-hide-button* hideit)
 		hideit))
 	     (iup:hbox
-	      (iup:button "Quit"      #:action (lambda (obj)(if *db* (sqlite3:finalize! *db*))(exit)))
+	      (iup:button "Quit"      #:action (lambda (obj)(if *db* (db:close-all *db*))(exit)))
 	      (iup:button "Refresh"   #:action (lambda (obj)
 						 (mark-for-update)))
 	      (iup:button "Collapse"  #:action (lambda (obj)
 						 (let ((myname (iup:attribute obj "TITLE")))
 						   (if (equal? myname "Collapse")
@@ -1490,11 +1490,11 @@
   (let ((runid (string->number (args:get-arg "-run"))))
     (if runid
 	(begin
 	  (lambda (x)
 	    (on-exit (lambda ()
-		       (if *db* (sqlite3:finalize! *db*))))
+		       (if *db* (db:close-all *db*))))
 	    (examine-run *db* runid)))
 	(begin
 	  (print "ERROR: runid is not a number " (args:get-arg "-run"))
 	  (exit 1)))))
  ((args:get-arg "-test")
@@ -1525,6 +1525,6 @@
 			     (set! *update-is-running* #f)
 			     (mutex-unlock! *update-mutex*))))
 		       1))))
 
 (iup:main-loop)
-(sqlite3:finalize! *db*)
+(db:close-all *db*)