@@ -16,16 +16,16 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;======================================================================
 
-(use format typed-records) ;; RADT => purpose of json format??
-
-(declare (unit rmt))
-(declare (uses api))
-(declare (uses http-transport))
-(include "common_records.scm")
+;; (use format typed-records) ;; RADT => purpose of json format??
+;; 
+;; (declare (unit rmt))
+;; (declare (uses api))
+;; (declare (uses http-transport))
+;; (include "common_records.scm")
 ;; (declare (uses rmtmod))
 
 ;; (import rmtmod)
 
 ;;
@@ -371,11 +371,11 @@
 
 (define (rmt:open-qry-close-locally cmd run-id params #!key (remretries 5))
   (let* ((qry-is-write   (not (member cmd api:read-only-queries)))
 	 (db-file-path   (db:dbfile-path)) ;;  0))
 	 (dbstruct-local (db:setup #t))  ;; make-dbr:dbstruct path:  dbdir local: #t)))
-	 (read-only      (not (file-write-access? db-file-path)))
+	 (read-only      (not (file-writable? db-file-path)))
 	 (start          (current-milliseconds))
 	 (resdat         (if (not (and read-only qry-is-write))
 			     (let ((v (api:execute-requests dbstruct-local (vector (symbol->string cmd) params))))
 			       (handle-exceptions ;; there has been a long history of receiving strange errors from values returned by the client when things go wrong..
 				exn               ;;  This is an attempt to detect that situation and recover gracefully
@@ -395,11 +395,11 @@
         (debug:print 0 *default-log-port* "ERROR: attempt to write to read-only database ignored. cmd=" cmd))
     (if (not success)
 	(if (> remretries 0)
 	    (begin
 	      (debug:print-error 0 *default-log-port* "local query failed. Trying again.")
-	      (thread-sleep! (/ (random 5000) 1000)) ;; some random delay 
+	      (thread-sleep! (/ (pseudo-random-integer 5000) 1000)) ;; some random delay 
 	      (rmt:open-qry-close-locally cmd run-id params remretries: (- remretries 1)))
 	    (begin
 	      (debug:print-error 0 *default-log-port* "too many retries in rmt:open-qry-close-locally, giving up")
 	      #f))
 	(begin
@@ -974,11 +974,11 @@
 (define (rmtmod:calc-ro-mode runremote *toppath*)
   (if (and runremote
 	   (remote-ro-mode-checked runremote))
       (remote-ro-mode runremote)
       (let* ((dbfile  (conc *toppath* "/megatest.db"))
-	     (ro-mode (not (file-write-access? dbfile)))) ;; TODO: use dbstruct or runremote to figure this out in future
+	     (ro-mode (not (file-writable? dbfile)))) ;; TODO: use dbstruct or runremote to figure this out in future
 	(if runremote
 	    (begin
 	      (remote-ro-mode-set! runremote ro-mode)
 	      (remote-ro-mode-checked-set! runremote #t)
 	      ro-mode)