Index: cookie.scm
==================================================================
--- cookie.scm
+++ cookie.scm
@@ -45,11 +45,11 @@
 ;; (declare (unit cookie))
 
 (module cookie
     *
 
-(import chicken scheme data-structures extras srfi-13 ports posix)
+(import (chicken base) scheme queues srfi-13 (chicken port) (chicken io)(chicken file) (chicken format) (chicken string) (chicken time posix))
   
 (require-extension srfi-1 srfi-13 srfi-14 regex)
 ;; (use  srfi-1 srfi-13 srfi-14 regex)
 ;; (declare (export parse-cookie-string construct-cookie-string))
 

Index: stml2.scm
==================================================================
--- stml2.scm
+++ stml2.scm
@@ -12,16 +12,17 @@
 ;; (declare (unit stml))
 
 (module stml2
     *
 
-(import chicken scheme data-structures extras srfi-13 ports posix srfi-69 files srfi-1) 
+(import (chicken random) (chicken base) (chicken string) (chicken time) scheme queues srfi-13 (chicken port) (chicken io) (chicken file) srfi-69 srfi-1 (chicken condition) (chicken time posix) (chicken process-context posix) (chicken pathname) (chicken blob) (chicken format) (chicken process) (chicken process-context)) 
 
-(use cookie (prefix dbi dbi:) (prefix crypt c:) typed-records)
+(import cookie)
+(import (prefix dbi dbi:) (prefix crypt c:) typed-records)
 
 ;; (declare (uses misc-stml))
-(use regex)
+(import regex)
 
 ;; The (usually global) sdat contains everything about the session
 ;;
 (defstruct sdat
   ;; database
@@ -420,11 +421,11 @@
 ;;  (s:get-key 'n 1)     => "n99e1882" n=number 99e is the week number since 1970, remainder is random
 ;;  (s:key->val "n1882") => 1
 ;;
 ;;  first letter is a type: n=number, s=string, b=boolean
 (define (s:get-key key-type val)
-  (let ((mkrandstr (lambda (innum)(number->string (random innum) 16)))
+  (let ((mkrandstr (lambda (innum)(number->string (pseudo-random-integer innum) 16)))
 	(week      (number->string (quotient (current-seconds) (* 7 24 60 60)) 16)))
     (let loop ((siz 1000)
 	       (key (conc key-type week (mkrandstr 100)))
 	       (num 0))
       (if (s:session-var-get key) ;; have a collision
@@ -648,11 +649,11 @@
 
 #;(define (session:get-nth-char nth)
   (substring session:valid-chars nth  (+ nth 1)))
 
 #;(define (session:get-rand-char)
-  (session:get-nth-char (random session:num-valid-chars)))
+  (session:get-nth-char (pseudo-random-integer session:num-valid-chars)))
 
 #;(define (session:make-rand-string len)
   (let loop ((res "")
              (n   1))
     (if (> n len) res
@@ -663,11 +664,11 @@
 ;;
 #;(define (session:generic-make-rand-string len seed-string)
   (let ((num-chars (string-length seed-string)))
     (let loop ((res "")
 	       (n   1))
-      (let ((char-num (random num-chars)))
+      (let ((char-num (pseudo-random-integer num-chars)))
 	(if (> n len) res
 	    (loop (string-append res (substring seed-string char-num (+ char-num 1)))
 		  (+ n 1)))))))
 
 ;; Rely on crypt egg's default settings being secure enough, accept
@@ -1428,11 +1429,11 @@
 
 (define (session:get-nth-char nth)
   (substring session:valid-chars nth  (+ nth 1)))
 
 (define (session:get-rand-char)
-  (session:get-nth-char (random session:num-valid-chars)))
+  (session:get-nth-char (pseudo-random-integer session:num-valid-chars)))
 
 (define (session:make-rand-string len)
   (let loop ((res "")
              (n   1))
     (if (> n len) res
@@ -1443,11 +1444,11 @@
 ;;
 (define (session:generic-make-rand-string len seed-string)
   (let ((num-chars (string-length seed-string)))
     (let loop ((res "")
 	       (n   1))
-      (let ((char-num (random num-chars)))
+      (let ((char-num (pseudo-random-integer num-chars)))
 	(if (> n len) res
 	    (loop (string-append res (substring seed-string char-num (+ char-num 1)))
 		  (+ n 1)))))))
 
 
@@ -1706,11 +1707,11 @@
 	  ;; The 'auto method will distribute dbs across the disk using hash
 	  ;; of user host and user. TODO
 	  ;; (if (eq? dbfname 'auto) ;; This is the auto assignment of a db based on hash of IP
 	  (let ((dbpath (pathname-directory dbfname)))  ;; do a couple sanity checks here to make setting up easier
 	    (if debugmode (session:log self "INFO: setting up for sqlite3 db access to " dbfname))
-	    (if (not (file-write-access? dbpath))
+	    (if (not (file-writable? dbpath))
 		(session:log self "WARNING: Cannot write to " dbpath)
 		(if debugmode (session:log self "INFO: " dbpath " is writeable")))
 	    (if (file-exists? dbfname)
 		(begin
 		  ;; (session:log self "setting dbexists to #t")