diff --git a/etc/config.csh/aliases b/etc/config.csh/aliases
index 8cab2641d95e79042395a7c00d3bc4a976b097b1..33bb0e4a98d93b9ead91d6615e07e3e2efff019b 100644
--- a/etc/config.csh/aliases
+++ b/etc/config.csh/aliases
@@ -38,12 +38,10 @@ alias wm32 'wmSet WM_ARCH_OPTION=32'
 alias wmSP 'wmSet WM_PRECISION_OPTION=SP'
 alias wmDP 'wmSet WM_PRECISION_OPTION=DP'
 
-# Refresh the environment
-alias wmRefresh 'wmSet $FOAM_SETTINGS'
-
 # Clear env
 alias wmUnset 'source $WM_PROJECT_DIR/etc/config.csh/unset'
 
+
 # Toggle wmakeScheduler on/off
 #  - also need to set WM_HOSTS
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -70,6 +68,11 @@ alias tut 'cd $FOAM_TUTORIALS'
 alias run 'cd $FOAM_RUN'
 
 
+# Refresh the environment
+# ~~~~~~~~~~~~~~~~~~~~~~~
+alias wmRefresh 'set wmProjectDir=$WM_PROJECT_DIR; set foamSettings=$FOAM_SETTINGS; wmUnset; source $wmProjectDir/etc/cshrc $foamSettings'
+
+
 # Change OpenFOAM version
 # ~~~~~~~~~~~~~~~~~~~~~~~
 alias foamVersion \
diff --git a/etc/config.csh/unset b/etc/config.csh/unset
index 3aaac75a05cbaba0be25fc859ae2f7a1bd3ea493..bb755277c6f3299fddf98ea8b8aea3a73c55e87a 100644
--- a/etc/config.csh/unset
+++ b/etc/config.csh/unset
@@ -38,9 +38,13 @@ if ( $?WM_PROJECT_DIR ) then
 endif
 
 # The old dirs to be cleaned from the environment variables
-set foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR \
-    $HOME/$WM_PROJECT/$LOGNAME $WM_PROJECT_SITE \
-    $FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN $ParaView_DIR"
+set foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR $HOME/$WM_PROJECT/$LOGNAME $FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN"
+if ( $?WM_PROJECT_SITE ) then
+   set foamOldDirs="$foamOldDirs $WM_PROJECT_SITE"
+endif
+if ( $?ParaView_DIR ) then
+   set foamOldDirs="$foamOldDirs $ParaView_DIR"
+endif
 
 
 #------------------------------------------------------------------------------
@@ -125,6 +129,7 @@ unsetenv PV_PLUGIN_PATH
 #------------------------------------------------------------------------------
 # Unset CGAL-related environment variables
 
+unsetenv BOOST_ARCH_PATH
 unsetenv CGAL_ARCH_PATH
 
 
diff --git a/etc/config.sh/aliases b/etc/config.sh/aliases
index 7c2a7a378f655edef9d5ad5e1b9a35eaeeaa615b..3d24149d77dc685e7d774d09498d18e8302e5685 100644
--- a/etc/config.sh/aliases
+++ b/etc/config.sh/aliases
@@ -38,9 +38,6 @@ alias wm32='wmSet WM_ARCH_OPTION=32'
 alias wmSP='wmSet WM_PRECISION_OPTION=SP'
 alias wmDP='wmSet WM_PRECISION_OPTION=DP'
 
-# Refresh the environment
-alias wmRefresh='wmSet $FOAM_SETTINGS'
-
 # Clear env
 alias wmUnset='. $WM_PROJECT_DIR/etc/config.sh/unset'
 
@@ -70,6 +67,18 @@ alias tut='cd $FOAM_TUTORIALS'
 alias run='cd $FOAM_RUN'
 
 
+# Refresh the environment
+# ~~~~~~~~~~~~~~~~~~~~~~~
+unset wmRefresh
+wmRefresh()
+{
+    wmProjectDir=$WM_PROJECT_DIR
+    foamSettings=$FOAM_SETTINGS
+    wmUnset
+    . $wmProjectDir/etc/bashrc $foamSettings
+}
+
+
 # Change OpenFOAM version
 # ~~~~~~~~~~~~~~~~~~~~~~~
 unset foamVersion
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index 77777d92c278e77766755e549a21f253109f4945..7c8443f9190b14df60a916f1f69c7422ac275c9d 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -119,6 +119,7 @@ unset PV_PLUGIN_PATH
 #------------------------------------------------------------------------------
 # Unset CGAL-related environment variables
 
+unset BOOST_ARCH_PATH
 unset CGAL_ARCH_PATH
 
 
@@ -151,7 +152,6 @@ unalias wm32
 unalias wmSP
 unalias wmDP
 
-unalias wmRefresh
 unalias wmUnset
 
 unalias wmSchedOn
@@ -168,6 +168,7 @@ unalias util
 unalias tut
 unalias run
 
+unset wmRefresh
 unset foamVersion
 unset foamPV
 
diff --git a/etc/cshrc b/etc/cshrc
index 2fac1a1c83198600659b3d537542b8d43928c0f1..c2f17948b131b0e46c373febbfac1ffe6a5ea735 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -105,7 +105,22 @@ setenv FOAM_SIGFPE
 ################################################################################
 
 # The old dirs to be cleaned from the environment variables
-set foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR $HOME/$WM_PROJECT/$LOGNAME $FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN"
+set foamOldDirs=
+if ( $?WM_PROJECT_DIR ) then
+   set foamOldDirs="$foamOldDirs $WM_PROJECT_DIR"
+endif
+if ( $?WM_THIRD_PARTY_DIR ) then
+   set foamOldDirs="$foamOldDirs $WM_THIRD_PARTY_DIR"
+endif
+if ( $?WM_PROJECT ) then
+   set foamOldDirs="$foamOldDirs $HOME/$WM_PROJECT/$LOGNAME"
+endif
+if ( $?FOAM_SITE_APPBIN ) then
+   set foamOldDirs="$foamOldDirs $FOAM_SITE_APPBIN"
+endif
+if ( $?FOAM_SITE_LIBBIN ) then
+   set foamOldDirs="$foamOldDirs $FOAM_SITE_LIBBIN"
+endif
 
 # Location of installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~