diff --git a/applications/solvers/multiphase/MPPICInterFoam/Allwmake b/applications/solvers/multiphase/MPPICInterFoam/Allwmake
index 7b128ad2e661771dc00a4ada8c47b81aba7b23a6..0becbda84c5f72d3722a2a026ae5037b349b90e1 100755
--- a/applications/solvers/multiphase/MPPICInterFoam/Allwmake
+++ b/applications/solvers/multiphase/MPPICInterFoam/Allwmake
@@ -1,5 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                            # Run from this directory
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 #------------------------------------------------------------------------------
 
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwmake b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwmake
index 7410c1ccf98193eb8191d1e6a72b4155f18815b3..1bebf480a104f075fb29523d78cded5920f50ac3 100755
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwmake
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwmake
@@ -1,15 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
-
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
-wmakeLnInclude massTransferModels
-wmake phasesSystem
-wmake massTransferModels
-wmake CompressibleMultiPhaseTurbulenceModels
-wmake laserDTRM
-wmake
+#------------------------------------------------------------------------------
 
+wmakeLnInclude massTransferModels
+wmake $targetType phasesSystem
+wmake $targetType massTransferModels
+wmake $targetType CompressibleMultiPhaseTurbulenceModels
+wmake $targetType laserDTRM
+wmake $targetType
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/Allwmake b/applications/utilities/surface/surfaceBooleanFeatures/Allwmake
index 933ee039b9819872139af740cdb18924e56f1983..ba466eaf251e5675c6b2dcfa375ebd33da164139 100755
--- a/applications/utilities/surface/surfaceBooleanFeatures/Allwmake
+++ b/applications/utilities/surface/surfaceBooleanFeatures/Allwmake
@@ -8,7 +8,7 @@ unset COMP_FLAGS LINK_FLAGS
 
 if have_cgal
 then
-    wmake PolyhedronReader
+    wmake $targetType PolyhedronReader
     export COMP_FLAGS='-IPolyhedronReader'
     export LINK_FLAGS='${CGAL_LIBS} -lPolyhedronReader'
 else
diff --git a/src/functionObjects/graphics/Allwmake b/src/functionObjects/graphics/Allwmake
index ab6a4e7c8918b988cafeff013a4f0d0ddc85a7f1..a4a8f46b9b8471ef5b9b1696046fd6cd94c39408 100755
--- a/src/functionObjects/graphics/Allwmake
+++ b/src/functionObjects/graphics/Allwmake
@@ -3,6 +3,6 @@ cd ${0%/*} || exit 1                        # Run from this directory
 
 #------------------------------------------------------------------------------
 
-runTimePostProcessing/Allwmake
+runTimePostProcessing/Allwmake $*
 
 #------------------------------------------------------------------------------
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index d13a5f43e5e3b9a87264822610524ff7437b34b3..956a714d9476187347165cf20b3ff56d1d16ad7f 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -157,7 +157,6 @@ $(cellSources)/fieldToCell/fieldToCell.C
 $(cellSources)/labelToCell/labelToCell.C
 $(cellSources)/nbrToCell/nbrToCell.C
 $(cellSources)/nearestToCell/nearestToCell.C
-$(cellSources)/noneToCell/noneToCell.C
 $(cellSources)/pointToCell/pointToCell.C
 $(cellSources)/regionToCell/regionToCell.C
 $(cellSources)/rotatedBoxToCell/rotatedBoxToCell.C
@@ -177,7 +176,6 @@ $(faceSources)/cylinderAnnulusToFace/cylinderAnnulusToFace.C
 $(faceSources)/cylinderToFace/cylinderToFace.C
 $(faceSources)/faceToFace/faceToFace.C
 $(faceSources)/labelToFace/labelToFace.C
-$(faceSources)/noneToFace/noneToFace.C
 $(faceSources)/normalToFace/normalToFace.C
 $(faceSources)/patchToFace/patchToFace.C
 $(faceSources)/pointToFace/pointToFace.C
@@ -191,7 +189,6 @@ $(pointSources)/cellToPoint/cellToPoint.C
 $(pointSources)/faceToPoint/faceToPoint.C
 $(pointSources)/labelToPoint/labelToPoint.C
 $(pointSources)/nearestToPoint/nearestToPoint.C
-$(pointSources)/noneToPoint/noneToPoint.C
 $(pointSources)/pointToPoint/pointToPoint.C
 $(pointSources)/surfaceToPoint/surfaceToPoint.C
 $(pointSources)/zoneToPoint/zoneToPoint.C