diff --git a/src/paraview-plugins/Allwclean b/src/paraview-plugins/Allwclean
index 74d66bd2579e08b68eae6e3ce9366fbdf2d3ba13..4336df9dea9a1b55fd2a219bbd18f2beed67d355 100755
--- a/src/paraview-plugins/Allwclean
+++ b/src/paraview-plugins/Allwclean
@@ -1,6 +1,10 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                            # Run from this directory
-. $WM_PROJECT_DIR/wmake/scripts/wmakeFunctions  # Source wmake functions
+cd ${0%/*} || exit 1                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/wmake/scripts/wmakeFunctions  # Require wmake functions
+. ${WM_PROJECT_DIR:?}/wmake/scripts/paraviewFunctions # For API info
+# -----------------------------------------------------------------------------
+
+get_pvplugin_api || echo "No ParaView plugin information found" 1>&2
 
 # Cleanup libraries
 wclean libso foamPv
diff --git a/src/paraview-plugins/Allwmake b/src/paraview-plugins/Allwmake
index 656c1e6d2fd97b438ea6d1840aeffb3d0aba69d1..4e9cccfdb6a55d84dfe91457b1bce4e81d1b9f38 100755
--- a/src/paraview-plugins/Allwmake
+++ b/src/paraview-plugins/Allwmake
@@ -1,9 +1,8 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                            # Run from this directory
-export WM_CONTINUE_ON_ERROR=true                # Optional unit
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-. $WM_PROJECT_DIR/wmake/scripts/paraviewFunctions  # CMake and PV functions
-
+cd ${0%/*} || exit 1                                # Run from this directory
+export WM_CONTINUE_ON_ERROR=true                    # Optional unit
+. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
+. ${WM_PROJECT_DIR:?}/wmake/scripts/paraviewFunctions # CMake, PV functions
 # -----------------------------------------------------------------------------
 
 warnIncomplete()
@@ -20,7 +19,7 @@ then
     wmakeLibPv blockMeshReader/library
     wmakeLibPv foamReader/library
 
-    unset cmakeType
+    unset cmakeOpts cmakeType
 
     if [ "$targetType" != objects ]
     then
@@ -37,8 +36,8 @@ then
 
     if [ -n "$cmakeType" ]
     then
-        "$cmakeType" $PWD/blockMeshReader || warnIncomplete "blockMesh"
-        "$cmakeType" $PWD/foamReader || warnIncomplete "OpenFOAM"
+        "$cmakeType" $PWD/blockMeshReader "$cmakeOpts" || warnIncomplete "blockMesh"
+        "$cmakeType" $PWD/foamReader "$cmakeOpts" || warnIncomplete "OpenFOAM"
     fi
 )
 fi