@@ -561,19 +561,19 @@
 ;; NOTE: list-runs and list-db-targets operate on local db!!!
 ;;
 (if (or (args:get-arg "-list-runs")
 	(args:get-arg "-list-db-targets"))
     (if (setup-for-run)
-	(let* ((db       (make-dbr:dbstruct path: *toppath* local: #t))
+	(let* ((dbstruct (make-dbr:dbstruct path: *toppath* local: #t))
 	       (runpatt  (args:get-arg "-list-runs"))
 	       (testpatt (if (args:get-arg "-testpatt") 
 			     (args:get-arg "-testpatt") 
 			     "%"))
-	       (runsdat  (db:get-runs db runpatt #f #f '()))
+	       (runsdat  (db:get-runs dbstruct runpatt #f #f '()))
 	       (runs     (db:get-rows runsdat))
 	       (header   (db:get-header runsdat))
-	       (keys     (db:get-keys db))
+	       (keys     (db:get-keys dbstruct))
 	       (db-targets (args:get-arg "-list-db-targets"))
 	       (seen     (make-hash-table)))
 	  ;; Each run
 	  (for-each 
 	   (lambda (run)
@@ -586,11 +586,11 @@
 			 (hash-table-set! seen targetstr #t)
 			 ;; (print "[" targetstr "]"))))
 			 (print targetstr))))
 	       (if (not db-targets)
 		   (let* ((run-id (db:get-value-by-header run header "id"))
-			  (tests  (db:get-tests-for-run db run-id testpatt '() '() #f #f #f 'testname 'asc #f)))
+			  (tests  (db:get-tests-for-run dbstruct run-id testpatt '() '() #f #f #f 'testname 'asc #f)))
 		     (print "Run: " targetstr "/" (db:get-value-by-header run header "runname") 
 			    " status: " (db:get-value-by-header run header "state")
 			    " run-id: " run-id ", number tests: " (length tests))
 		     (for-each 
 		      (lambda (test)
@@ -614,11 +614,11 @@
 				     "\n         uname:    " (sdb:qry 'getstr (db:test-get-uname test))
 				     "\n         rundir:   " (filedb:get-path *fdb* (db:test-get-rundir test))
 				     )
 			      ;; Each test
 			      ;; DO NOT remote run
-			      (let ((steps (db:get-steps-for-test db (db:test-get-id test))))
+			      (let ((steps (db:get-steps-for-test dbstruct run-id (db:test-get-id test))))
 				(for-each 
 				 (lambda (step)
 				   (format #t 
 					   "    Step: ~20a State: ~10a Status: ~10a Time ~22a\n"
 					   (tdb:step-get-stepname step)
@@ -626,11 +626,12 @@
 					   (tdb:step-get-status step)
 					   (tdb:step-get-event_time step)))
 				 steps)))))
 		      tests)))))
 	     runs)
-	   (set! *didsomething* #t))))
+	  (db:close-all dbstruct)
+	  (set! *didsomething* #t))))
 
 ;;======================================================================
 ;; full run
 ;;======================================================================
 
@@ -815,17 +816,17 @@
 	;; else do a general-run-call
 	(general-run-call 
 	 "-test-paths"
 	 "Get paths to tests"
 	 (lambda (target runname keys keyvals)
-	   (let* ((db       (make-dbr:dbstruct path: *toppath* local: #t))
+	   (let* ((dbstruct (make-dbr:dbstruct path: *toppath* local: #t))
 		  ;; DO NOT run remote
-		  (paths    (db:test-get-paths-matching db keys target)))
+		  (paths    (db:test-get-paths-matching dbstruct keys target)))
 	     (for-each (lambda (path)
 			 (print path))
 		       paths)
-	     (sqlite3:finalize! db))))))
+	     (db:close-all dbstruct))))))
 
 ;;======================================================================
 ;; Extract a spreadsheet from the runs database
 ;;======================================================================
 
@@ -832,18 +833,18 @@
 (if (args:get-arg "-extract-ods")
     (general-run-call
      "-extract-ods"
      "Make ods spreadsheet"
      (lambda (target runname keys keyvals)
-       (let ((db         (make-dbr:dbstruct path: *toppath* local: #t))
+       (let ((dbstruct   (make-dbr:dbstruct path: *toppath* local: #t))
 	     (outputfile (args:get-arg "-extract-ods"))
 	     (runspatt   (args:get-arg ":runname"))
 	     (pathmod    (args:get-arg "-pathmod")))
 	     ;; (keyvalalist (keys->alist keys "%")))
 	 (debug:print 2 "Extract ods, outputfile: " outputfile " runspatt: " runspatt " keyvals: " keyvals)
-	 (db:extract-ods-file db outputfile keyvals (if runspatt runspatt "%") pathmod)
-	 (sqlite3:finalize! db)
+	 (db:extract-ods-file dbstruct outputfile keyvals (if runspatt runspatt "%") pathmod)
+	 (db:close-all dbstruct)
 	 (set! *didsomething* #t)))))
 
 ;;======================================================================
 ;; execute the test
 ;;    - gets called on remote host
@@ -1128,14 +1129,14 @@
 ;;======================================================================
 
 (if (or (args:get-arg "-repl")
 	(args:get-arg "-load"))
     (let* ((toppath (setup-for-run))
-	   (db      (if toppath (make-dbr:dbstruct path: toppath local: #t) #f)))
-      (if db
+	   (dbstruct (if toppath (make-dbr:dbstruct path: toppath local: #t) #f)))
+      (if dbstruct
 	  (begin
-	    (set! *db* db)
+	    (set! *db* dbstruct)
 	    (set! *client-non-blocking-mode* #t)
 	    (import readline)
 	    (import apropos)
 	    ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
 	    (gnu-history-install-file-manager
@@ -1142,25 +1143,28 @@
 	     (string-append
 	      (or (get-environment-variable "HOME") ".") "/.megatest_history"))
 	    (current-input-port (make-gnu-readline-port "megatest> "))
 	    (if (args:get-arg "-repl")
 		(repl)
-		(load (args:get-arg "-load"))))
+		(load (args:get-arg "-load")))
+	    (db:close-all dbstruct))
 	  (exit))
       (set! *didsomething* #t)))
 
+;; Not converted to use dbstruct yet
+;;
 (if (args:get-arg "-convert-to-norm")
     (let* ((toppath (setup-for-run))
-	   (db      (if toppath (make-dbr:dbstruct path: toppath local: #t))))
+	   (dbstruct (if toppath (make-dbr:dbstruct path: toppath local: #t))))
       (for-each 
        (lambda (field)
 	 (let ((dat '()))
 	   (debug:print-info 0 "Getting data for field " field)
 	   (sqlite3:for-each-row
 	    (lambda (id val)
 	      (set! dat (cons (list id val) dat)))
-	    db
+	    (get-db db run-id)
 	    (conc "SELECT id," field " FROM tests;"))
 	   (debug:print-info 0 "found " (length dat) " items for field " field)
 	   (let ((qry (sqlite3:prepare db (conc "UPDATE tests SET " field "=? WHERE id=?;"))))
 	     (for-each
 	      (lambda (item)
@@ -1168,10 +1172,11 @@
 		  (if (not (equal? newval (cadr item)))
 		      (debug:print-info 0 "Converting " (cadr item) " to " newval " for test #" (car item)))
 		  (sqlite3:execute qry newval (car item))))
 	      dat)
 	     (sqlite3:finalize! qry))))
+       (db:close-all dbstruct)
        (list "uname" "rundir" "final_logf" "comment"))
       (set! *didsomething* #t)))
 
 ;;======================================================================
 ;; Exit and clean up