Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -104,10 +104,12 @@
 	(begin
 	  (debug:print-info 0 "Starting server on " target-host ", logfile is " logfile)
 	  (setenv "TARGETHOST" target-host)))
     (setenv "TARGETHOST_LOGF" logfile)
     (system (conc "nbfake " cmdln))
+    (unsetenv "TARGETHOST_LOGF")
+    (if (get-environment-variable "TARGETHOST")(unsetenv "TARGETHOST"))
     ;; (system cmdln)
     (pop-directory)))
 
 ;; kind start up of servers, wait 40 seconds before allowing another server for a given
 ;; run-id to be launched

Index: utils/nbfake
==================================================================
--- utils/nbfake
+++ utils/nbfake
@@ -33,18 +33,20 @@
 
 # Make sure nbfake host and logfile are set. Fall back to old-style variable names
 
 if [[ -z "$NBFAKE_HOST" && -n "$TARGETHOST" ]]; then 
   MY_NBFAKE_HOST=$TARGETHOST     
+  unset TARGETHOST
 else
   MY_NBFAKE_HOST=$NBFAKE_HOST
   unset NBFAKE_HOST
 fi
 
 
 if [[ -z "$NBFAKE_LOG" && -n "$TARGETHOST_LOGF" ]]; then 
   MY_NBFAKE_LOG=$TARGETHOST_LOGF
+  unset TARGETHOST_LOGF
 else
   MY_NBFAKE_LOG=$NBFAKE_LOG
   unset NBFAKE_LOG
 fi