@@ -2013,15 +2013,15 @@
       (get-unix-df path)))
 
 (define (get-free-inodes path)
   (if (configf:lookup *configdat* "setup" "free-inodes-script")
       (with-input-from-pipe 
-       (conc (configf:lookup *configdat* "setup" "free-inodes-script") " " path)
-       (lambda ()
-	 (let ((res (read-line)))
-	   (if (string? res)
-	       (string->number res)))))
+	  (conc (configf:lookup *configdat* "setup" "free-inodes-script") " " path)
+	(lambda ()
+	  (let ((res (read-line)))
+	    (if (string? res)
+		(string->number res)))))
       (get-unix-inodes path)))
 
 (define (get-unix-df path)
   (let* ((df-results (process:cmd-run->list (conc "df " path)))
 	 (space-rx   (regexp "([0-9]+)\\s+([0-9]+)%"))
@@ -2037,11 +2037,11 @@
     freespc))
 
 (define (get-unix-inodes path)
   (let* ((df-results (process:cmd-run->list (conc "df -i " path)))
 	 (space-rx   (regexp "([0-9]+)\\s+([0-9]+)%"))
-	 (freenodes    #f))
+	 (freenodes    0)) ;; 0 is a better failsafe than #f here.
     ;; (write df-results)
     (for-each (lambda (l)
 		(let ((match (string-search space-rx l)))
 		  (if match 
 		      (let ((newval (string->number (cadr match))))
@@ -2225,11 +2225,11 @@
 
 	      
 (define (save-environment-as-files fname #!key (ignorevars (list "USER" "HOME" "DISPLAY" "LS_COLORS" "XKEYSYMDB" "EDITOR" "MAKEFLAGS" "MAKEF" "MAKEOVERRIDES")))
   ;;(bb-check-path msg: "save-environment-as-files entry")
   (let ((envvars (get-environment-variables))
-        (whitesp (regexp "[^a-zA-Z0-9_\\-:,.\\/%$]"))
+        (whitesp (regexp "[^a-zA-Z0-9_\\-:,\\.\\/%$]"))
 	(mungeval (lambda (val)
 		    (cond
 		     ((eq? val #t) "") ;; convert #t to empty string
 		     ((eq? val #f) #f) ;; convert #f to itself (still thinking about this one
 		     (else val)))))