Index: misc-stml.scm
==================================================================
--- misc-stml.scm
+++ misc-stml.scm
@@ -12,10 +12,11 @@
 ;;======================================================================
 
 (declare (unit misc-stml))
 (use (prefix crypt c:))
 (use regex)
+(use (prefix dbi dbi:))
 
 ;; given a list of symbols give the count of the matching symbol
 ;; l => '(a b c)  (dumobj:indx a 'b) => 1
 (define (s:get-fieldnum lst field-name)
   (let loop ((head (car lst))

Index: session.scm
==================================================================
--- session.scm
+++ session.scm
@@ -7,12 +7,12 @@
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
 
 (declare (unit session))
 ;; (require-library dbi)
-(use dbi)
-(import (prefix dbi dbi:))
+;; (use dbi)
+(use (prefix dbi dbi:))
 (require-extension regex)
 (declare (uses cookie))
 
 ;; sessions table
 ;; id session_id session_key
@@ -742,11 +742,11 @@
 			  (string-intersperse
 			   (string-split (s:html-filter->string res tags) "\n")
 			   "\\n")
 			  "\r")
 			 "\\r")
-			res))
+			res)) ;; should return #f if not a string and can't escape it?
       (else      (if (string? res)
 		     (s:html-filter->string res '())
 		     res)))))
 
 (define (session:get-param self key type-params)