diff --git a/etc/bashrc b/etc/bashrc
index d15c5324d569f1317618113b4952e9332a1cd79c..c3e7c82bb35b207dd6e247066469fae7d8f8ec10 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -272,4 +272,4 @@ fi
 unset cleaned foamClean foamInstall foamOldDirs
 unset _foamSource
 
-# -----------------------------------------------------------------------------
+# ----------------------------------------------------------------- end-of-file
diff --git a/etc/cshrc b/etc/cshrc
index 7b959e8c432619c440282af76f69fa60f28f5d2e..bc7a586882457ac4d95a5edb896a0c95b0a1bb8b 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -265,4 +265,4 @@ endif
 unset cleaned foamClean foamInstall foamOldDirs
 unalias _foamSource
 
-# -----------------------------------------------------------------------------
+# ----------------------------------------------------------------- end-of-file
diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE
index 775747ea66096a1a2dab7828db2395dac76f9884..5484ee451ba1cd86d7c635559ef6bffac0462c27 100644
--- a/etc/prefs.csh-EXAMPLE
+++ b/etc/prefs.csh-EXAMPLE
@@ -50,4 +50,4 @@
 setenv ParaView_VERSION git        # eg, cvs/git version
 setenv ParaView_MAJOR 3.7
 
-# -----------------------------------------------------------------------------
+# ----------------------------------------------------------------- end-of-file
diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE
index 5878e82dbc00cd71bdb9fecc9be850b1b8ea1b0c..0a0b25daae9be7aabc92fbee2ecb1f05fffa294d 100644
--- a/etc/prefs.sh-EXAMPLE
+++ b/etc/prefs.sh-EXAMPLE
@@ -49,4 +49,5 @@ export WM_MPLIB=SYSTEMOPENMPI
 # ~~~~~~~~~~~~~~~~~~~~~~~~
 export ParaView_VERSION=git        # eg, cvs/git version
 export ParaView_MAJOR=3.7
-# -----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/etc/settings.csh b/etc/settings.csh
index 7a0d1f40c8eb575ac81be8ee0502510479ebc4fe..7364fc8a50f5ba3bf09fec92964af4316bdd320b 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -117,8 +117,8 @@ case OpenFOAM:
     endif
 
     _foamAddPath    ${WM_COMPILER_DIR}/bin
-    _foamAddLib     ${WM_COMPILER_DIR}/lib${WM_COMPILER_LIB_ARCH}
     _foamAddLib     ${WM_COMPILER_DIR}/lib
+    _foamAddLib     ${WM_COMPILER_DIR}/lib${WM_COMPILER_LIB_ARCH}
     _foamAddMan     ${WM_COMPILER_DIR}/man
 
     breaksw
@@ -128,7 +128,7 @@ endsw
 # Communications library
 # ~~~~~~~~~~~~~~~~~~~~~~
 
-unset MPI_ARCH_PATH
+unsetenv MPI_ARCH_PATH
 
 switch ("$WM_MPLIB")
 case OPENMPI:
@@ -256,7 +256,7 @@ _foamAddLib $FOAM_MPI_LIBBIN
 
 # Set the minimum MPI buffer size (used by all platforms except SGI MPI)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-set minBufferSize=20000000
+if ( ! $?minBufferSize ) set minBufferSize=20000000
 
 if ( $?MPI_BUFFER_SIZE ) then
     if ( $MPI_BUFFER_SIZE < $minBufferSize ) then
@@ -283,9 +283,7 @@ endif
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unalias _foamAddPath
-unalias _foamAddLib
-unalias _foamAddMan
-unset minBufferSize
+unalias _foamAddPath _foamAddLib _foamAddMan
+unset compilerInstall minBufferSize
 
-# -----------------------------------------------------------------------------
+# ----------------------------------------------------------------- end-of-file
diff --git a/etc/settings.sh b/etc/settings.sh
index ca3ab25c2c2663f5d7b9c6edb52d11ec8db4b0f0..247b3a54ff03f126d2ccfe72249aceaa58ca08ed 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -295,7 +295,7 @@ _foamAddLib $FOAM_MPI_LIBBIN
 
 # Set the minimum MPI buffer size (used by all platforms except SGI MPI)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-minBufferSize=20000000
+: ${minBufferSize:=20000000}
 
 if [ "${MPI_BUFFER_SIZE:=$minBufferSize}" -lt $minBufferSize ]
 then
@@ -321,4 +321,4 @@ export MPI_BUFFER_SIZE
 # ~~~~~~~~~~~~~~~~~~~~
 unset _foamAddPath _foamAddLib _foamAddMan minBufferSize
 
-# -----------------------------------------------------------------------------
+# ----------------------------------------------------------------- end-of-file