diff --git a/Allwclean b/Allwclean
index 04cca3f0e75b2cb06263745762970f1cc552da6a..05bebd0bd3494acfb7bed9608b3ff10c43965522 100755
--- a/Allwclean
+++ b/Allwclean
@@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
 
 #------------------------------------------------------------------------------
 
diff --git a/Allwmake b/Allwmake
index e80e4269dbe5cc8660a3e440576a339a21ead3a3..6cffdf29b72d895cd8522dcb5d08393283a3aea2 100755
--- a/Allwmake
+++ b/Allwmake
@@ -1,15 +1,12 @@
 #!/bin/sh
-cd "${0%/*}" || exit                            # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
 targetType=libso
-# Parse arguments for library compilation
-if [ -f "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments ]
-then  . "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments
-fi
+. "${WM_PROJECT_DIR:?}"/wmake/scripts/AllwmakeParseArguments
 
 #------------------------------------------------------------------------------
 # Build into FOAM_USER_{APPBIN,LIBBIN} unless otherwise specified with
 # -prefix or FOAM_MODULE_{APPBIN,LIBBIN} env varables
-
+#------------------------------------------------------------------------------
 moduleName="avalanche"
 
 #------------------------------------------------------------------------------
@@ -22,11 +19,9 @@ echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
 echo "  prefix = ${FOAM_MODULE_PREFIX:-default (user)}"
 echo
 
-
 src/Allwmake $targetType $*
 applications/Allwmake $targetType $*
 
-
 # Some summary information
 echo
 date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
diff --git a/applications/Allwmake b/applications/Allwmake
index 8a804210c29c1695a537ec3b2844d627a94f6ec2..877b20bf5de6fbeb1e04880727783a5584e73353 100755
--- a/applications/Allwmake
+++ b/applications/Allwmake
@@ -1,11 +1,6 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
-
-# Parse arguments for library compilation
-if [ -f $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments ]
-then  . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-fi
-
+cd "${0%/*}" || exit                                # Run from this directory
+. "${WM_PROJECT_DIR:?}"/wmake/scripts/AllwmakeParseArguments
 #------------------------------------------------------------------------------
 
 wmake -all $targetType solvers
diff --git a/src/Allwmake b/src/Allwmake
index 055b8ced759835a3c0a5eb3b8f822859fed2fe6e..3286e60c017efc3381f4d0e6a1e81671da50a4a8 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -1,11 +1,6 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
-
-# Parse arguments for library compilation
-if [ -f $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments ]
-then  . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-fi
-
+cd "${0%/*}" || exit                                # Run from this directory
+. "${WM_PROJECT_DIR:?}"/wmake/scripts/AllwmakeParseArguments
 #------------------------------------------------------------------------------
 
 wmake $targetType avalanche