@@ -239,23 +239,32 @@
 			     (api:dispatch-request dbstruct cmd run-id params))))))
       (set! *api-process-request-count* newcount)
       (set! *db-last-access* (current-seconds))
       (match indat
 	((cmd run-id params meta)
-	 (let* ((ttdat   *server-info*)
+	 (let* ((db-ok  (let* ((dbfname (dbmod:run-id->dbfname run-id))
+			       (ok      (equal? dbfname (dbr:dbstruct-dbfname dbstruct))))
+			  (case cmd
+			    ((ping) #t) ;; we are fine
+			    (else
+			     (if (not ok)(debug:print 0 *default-log-port* "ERROR: "cmd", run-id "run-id", not correct for dbfname "(dbr:dbstruct-dbfname dbstruct)))
+			     (assert ok "FATAL: database file and run-id not aligned.")))))
+		(ttdat   *server-info*)
 		(server-state (tt-state ttdat))
 		(status  (cond
 			  ;; ((> newcount 600) 'busy)
-			  ;; ((> newcount 300) 'loaded)
+			  ((> newcount 300) 'loaded)
 			  (else 'ok)))
 		(errmsg  (case status
 			   ((busy)   (conc "Server overloaded, "newcount" threads in flight"))
 			   ((loaded) (conc "Server loaded, "newcount" threads in flight"))
 			   (else     #f)))
 		(result  (case status
 			   ((busy)  (- newcount 29)) ;; call back in as many seconds
 			   ((loaded)
+			    (if (eq? (rmt:transport-mode) 'tcp)
+				(thread-sleep! 0.5))
 			    (normal-proc cmd run-id params))
 			   (else
 			    (normal-proc cmd run-id params))))
 		(meta   (case cmd
 			  ((ping) `((sstate . ,server-state)))
@@ -266,12 +275,11 @@
 	(else
 	 (assert #f "FATAL: failed to deserialize indat "indat))))))
        
 
 (define (api:dispatch-request dbstruct cmd run-id params)
-  (if (and (not *no-sync-db*)
-	   (member cmd '(db:no-sync-set db:no-sync-get/default db:no-sync-del! db:no-sync-get-lock )))
+  (if (not *no-sync-db*)
       (db:open-no-sync-db))
   (case cmd
     ;;===============================================
     ;; READ/WRITE QUERIES
     ;;===============================================