diff --git a/Allwmake b/Allwmake
index 749c60fc89..d0110357f8 100755
--- a/Allwmake
+++ b/Allwmake
@@ -1,19 +1,19 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-# run from this directory only
-cd ${0%/*} || exit 1
-
 # wmake is required for subsequent targets
-(cd wmake/src && make)
+( cd wmake/src && make )
 
-(cd $WM_THIRD_PARTY_DIR && ./Allwmake)
+( cd $WM_THIRD_PARTY_DIR && ./Allwmake )
 
-(cd src && ./Allwmake)
+( cd src && ./Allwmake )
 
-(cd applications && ./Allwmake)
+( cd applications && ./Allwmake )
 
 if [ "$1" = doc ]
 then
-   (cd doc && ./Allwmake)
+   ( cd doc && ./Allwmake )
 fi
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/Allwmake b/applications/Allwmake
index 7437e4f9b0..0c58257068 100755
--- a/applications/Allwmake
+++ b/applications/Allwmake
@@ -1,5 +1,8 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-( cd solvers && wmake all )
+( cd solvers   && wmake all )
 ( cd utilities && wmake all )
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/mesh/conversion/Optional/Allwmake b/applications/utilities/mesh/conversion/Optional/Allwmake
index ca1fbac090..2db40f48ad 100755
--- a/applications/utilities/mesh/conversion/Optional/Allwmake
+++ b/applications/utilities/mesh/conversion/Optional/Allwmake
@@ -1,9 +1,11 @@
 #!/bin/sh
+#
 # Build optional components (eg, may depend on third-party libraries)
+# -----------------------------------------------------------------------------
+
+cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-# run from this directory only
-cd ${0%/*} || exit 1
 
 # build libccmio and create lnInclude directory
 (
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/Allwclean b/applications/utilities/postProcessing/graphics/PV3FoamReader/Allwclean
index 206ee02089..80507fd289 100755
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/Allwclean
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/Allwclean
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 rm -rf PV3FoamReader/Make
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PV3FoamReader/Allwmake
index 9a91c33990..a7e703b8c0 100755
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/Allwmake
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
diff --git a/doc/Allwmake b/doc/Allwmake
index 0e4ba76d85..e75f1030e2 100755
--- a/doc/Allwmake
+++ b/doc/Allwmake
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 chmod a+rX $WM_PROJECT_DIR
@@ -6,3 +7,5 @@ chmod a+rX $WM_PROJECT_DIR/doc
 chmod -R a+rX Doxygen
 
 ( cd Doxygen && ./Allwmake )
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/doc/Doxygen/Allwmake b/doc/Doxygen/Allwmake
index f48d320d00..7f9ccb0522 100755
--- a/doc/Doxygen/Allwmake
+++ b/doc/Doxygen/Allwmake
@@ -5,5 +5,7 @@ umask 22
 rm -rf html latex man
 doxygen
 
-# fix permissions (NB: '-X' and not '-x'!)
+# fix permissions (NB: '+X' and not '+x'!)
 chmod -R a+rX ./
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/src/Allwmake b/src/Allwmake
index 08bb914b74..2c532a41aa 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -1,9 +1,11 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 ( cd OpenFOAM && wmakeLnInclude . )
 ( cd Pstream && ./Allwmake )
-wmake libo OSspecific/$WM_OS
+
+wmake libo  OSspecific/$WM_OS
 wmake libso OpenFOAM
 
 wmake libso lagrangian/basic
diff --git a/tutorials/Allclean b/tutorials/Allclean
index ac1f12662c..c72811f9fa 100755
--- a/tutorials/Allclean
+++ b/tutorials/Allclean
@@ -30,10 +30,12 @@
 #
 #------------------------------------------------------------------------------
 
+cd ${0%/*} || exit 1    # run from this directory
+
 echo "Cleaning backup files"
 find . -type f \( -name "*~" -o -name "*.bak" \) -exec rm {} \;
 find . \( -name 'core' -o -name 'core.[1-9]*' \) -exec rm {} \;
-find . \( -name '*.pvs' -o -name '*.foam' \) -exec rm {} \;
+find . \( -name '*.pvs' -o -name '*.OpenFOAM' \) -exec rm {} \;
 rm logs > /dev/null 2>&1
 rm testLoopReport > /dev/null 2>&1
 
diff --git a/tutorials/Allrun b/tutorials/Allrun
index e351dcadda..78bdcb516a 100755
--- a/tutorials/Allrun
+++ b/tutorials/Allrun
@@ -30,6 +30,8 @@
 #
 #------------------------------------------------------------------------------
 
+cd ${0%/*} || exit 1    # run from this directory
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
diff --git a/tutorials/Alltest b/tutorials/Alltest
index ec3da8513b..2b5152e822 100755
--- a/tutorials/Alltest
+++ b/tutorials/Alltest
@@ -30,6 +30,8 @@
 #
 #------------------------------------------------------------------------------
 
+cd ${0%/*} || exit 1    # run from this directory
+
 # FUNCTIONS
 #
 printUsage () {