Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -2474,17 +2474,10 @@
 
 ;;======================================================================
 ;; E N V I R O N M E N T   V A R S
 ;;======================================================================
 
-(define (bb-check-path #!key (msg "check-path: "))
-  (let ((path (or (get-environment-variable "PATH") "none")))
-    (debug:print-info 0 *default-log-port* (conc msg" : $PATH="path))
-    (if (string-match "^.*/isoenv-core/.*" path)
-        (debug:print-error 0 *default-log-port* (conc msg" : !!ISOENV PRESENT!!")) ;; remove for prod
-        (debug:print-info 1 *default-log-port* (conc msg" : **no isoenv present**")))))
-	      
 (define (save-environment-as-files fname #!key (ignorevars (list "USER" "HOME" "DISPLAY" "LS_COLORS" "XKEYSYMDB" "EDITOR" "MAKEFLAGS" "MAKEF" "MAKEOVERRIDES" "HOSTNAME")))
   ;;(bb-check-path msg: "save-environment-as-files entry")
   (let ((envvars (get-environment-variables))
         (whitesp (regexp "[^a-zA-Z0-9_\\-:,\\.\\/%$]"))
 	(mungeval (lambda (val)
@@ -2495,13 +2488,16 @@
     (with-output-to-file (conc fname ".csh")
        (lambda ()
           (for-each (lambda (keyval)
 		      (let* ((key   (car keyval))
 			     (val   (cdr keyval))
-			     (delim (if (string-search whitesp val) 
+			     (delim (if (and (string-search whitesp val)
+					     (not (string-search "^\".*\"$" val))
+					     (not (string-search "^'.*'$" val)))
 					"\""
 					"")))
+					
 			(print (if (or (member key ignorevars)
 				       (string-search whitesp key))
 				   "# setenv "
 				   "setenv ")
 			       key " " delim (mungeval val) delim)))
@@ -2509,11 +2505,13 @@
      (with-output-to-file (conc fname ".sh")
        (lambda ()
           (for-each (lambda (keyval)
 		      (let* ((key (car keyval))
 			     (val (cdr keyval))
-			     (delim (if (string-search whitesp val) 
+			     (delim (if (and (string-search whitesp val)
+					     (not (string-search "^\".*\"$" val))
+					     (not (string-search "^'.*'$" val)))
 					"\""
 					"")))
 			(print (if (or (member key ignorevars)
 				       (string-search whitesp key)
 				       (string-search ":" key)) ;; internal only values to be skipped.

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -1426,21 +1426,21 @@
       ((run)
        (set! full-cmd (conc full-cmd 
 			    " -run"
 			    " -testpatt "
 			    test-patt
-			    " -target-run "
+			    " -target "
 			    target
 			    " -runname "
 			    run-name
 			    " -clean-cache"
 			    )))
       ((remove-runs)
        (set! full-cmd (conc full-cmd
 			    " -remove-runs -runname "
 			    run-name
-			    " -target-run " 
+			    " -target " 
 			    target
 			    " -testpatt "
 			    test-patt
 			    states-str
 			    statuses-str

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -593,11 +593,11 @@
 	      (list  "MT_TARGET"    target)
 	      (list  "MT_LINKTREE"  (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree"))
 	      (list  "MT_TESTSUITENAME" (common:get-testsuite-name))))
           ;;(bb-check-path msg: "launch:execute post block 3")
 
-	  (if mt-bindir-path (setenv "PATH" (conc (getenv "PATH") ":" mt-bindir-path)))
+	  (if mt-bindir-path (setenv "PATH" (conc "\""(getenv "PATH")":"mt-bindir-path"\"")))
           ;;(bb-check-path msg: "launch:execute post block 4")
 	  ;; (change-directory top-path)
 	  ;; Can setup as client for server mode now
 	  ;; (client:setup)
 

Index: subrun.scm
==================================================================
--- subrun.scm
+++ subrun.scm
@@ -47,11 +47,11 @@
 
 (define (subrun:launch-dashboard test-run-dir)
   (if (subrun:subrun-test-initialized? test-run-dir)
       (let* ((subarea (subrun:get-runarea test-run-dir)))
         (if (and subarea (common:file-exists? subarea))
-            (system (conc "cd " subarea ";env -i PATH=$PATH DISPLAY=$DISPLAY HOME=$HOME USER=$USER dashboard &"))))))
+            (system (conc "cd " subarea ";env -i PATH=\"$PATH\" DISPLAY=$DISPLAY HOME=$HOME USER=$USER dashboard &"))))))
 
 (define (subrun:subrun-removed? test-run-dir)
   (if (subrun:subrun-test-initialized? test-run-dir)
       (let ((flagfile (conc test-run-dir "/subrun.removed")))
         (if (common:file-exists? flagfile)

Index: utils/mt_ezstep
==================================================================
--- utils/mt_ezstep
+++ utils/mt_ezstep
@@ -31,11 +31,11 @@
   exit
 fi
 
 # Since the user may not have . on the path and since we are likely to want to 
 # run test scripts in the current directory add the current dir to the path
-export PATH=$PATH:$PWD
+export PATH="$PATH:$PWD"
 testrundir=$1; shift
 stepname=$1;shift
 
 
 command=$*

Index: utils/nbfake
==================================================================
--- utils/nbfake
+++ utils/nbfake
@@ -96,10 +96,10 @@
 #======================================================================
 __EOF
 
 if [[ -z "$MY_NBFAKE_HOST" ]]; then
   # Run locally
-  sh -c "cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $WASHCMD $* >> $MY_NBFAKE_LOG 2>&1 &"
+  sh -c "cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=\"$PATH\"; nohup $WASHCMD $* >> $MY_NBFAKE_LOG 2>&1 &"
 else
   # run remotely
-  ssh -X -n -f $MY_NBFAKE_HOST "sh -c \"cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $WASHCMD $* >> $MY_NBFAKE_LOG 2>&1 &\""
+  ssh -X -n -f $MY_NBFAKE_HOST "sh -c \"cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=\"$PATH\"; nohup $WASHCMD $* >> $MY_NBFAKE_LOG 2>&1 &\""
 fi