diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi
index 922f7848a2..0de49ae5e0 100644
--- a/etc/config.csh/mpi
+++ b/etc/config.csh/mpi
@@ -40,7 +40,7 @@ case SYSTEMOPENMPI*:
     setenv FOAM_MPI openmpi-system
     _foamEtc -config openmpi-system             # <- Adjustments (optional)
 
-    # Respect MPI_ARCH_PATH if set to a valid directory (ie, from user adjustments)
+    # Respect MPI_ARCH_PATH if set to valid directory (eg, user adjustments)
     if (! $?MPI_ARCH_PATH ) setenv MPI_ARCH_PATH
     if ( -d "$MPI_ARCH_PATH" ) then
         _foamAddLibAuto $MPI_ARCH_PATH
@@ -58,7 +58,7 @@ case OPENMPI:
     setenv FOAM_MPI openmpi-1.10.7
     _foamEtc -config openmpi                    # <- Adjustments (optional)
 
-    # Respect MPI_ARCH_PATH if set to a valid directory (ie, from user adjustments)
+    # Respect MPI_ARCH_PATH if set to valid directory (eg, user adjustments)
     if (! $?MPI_ARCH_PATH ) setenv MPI_ARCH_PATH
     if (! -d "$MPI_ARCH_PATH" ) then
         setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
index ca7c0b1254..52c8826d88 100644
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@@ -46,7 +46,7 @@ SYSTEMOPENMPI*)
     fi
     _foamEtc -config  openmpi-system            # <- Adjustments (optional)
 
-    # Respect MPI_ARCH_PATH if set to a valid directory (ie, from user adjustments)
+    # Respect MPI_ARCH_PATH if set to valid directory (eg, user adjustments)
     if [ -d "$MPI_ARCH_PATH" ]
     then
         _foamAddLibAuto $MPI_ARCH_PATH
@@ -64,7 +64,7 @@ OPENMPI)
     export FOAM_MPI=openmpi-1.10.7
     _foamEtc -config  openmpi                   # <- Adjustments (optional)
 
-    # Respect MPI_ARCH_PATH if set to a valid directory (ie, from user adjustments)
+    # Respect MPI_ARCH_PATH if set to valid directory (eg, user adjustments)
     if [ ! -d "$MPI_ARCH_PATH" ]
     then
         export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
diff --git a/src/OpenFOAM/Make/options b/src/OpenFOAM/Make/options
index 84591cccba..ce477b7f08 100644
--- a/src/OpenFOAM/Make/options
+++ b/src/OpenFOAM/Make/options
@@ -1,3 +1,8 @@
+/* Preclude any possible issues if WM_PROJECT == OpenFOAM */
+ifeq ($(WM_PROJECT),OpenFOAM)
+    PROJECT_LIBS =
+endif
+
 EXE_INC = \
     -I$(OBJECTS_DIR)
 
diff --git a/wmake/makefiles/general b/wmake/makefiles/general
index 2177e89a87..f54c8410a7 100644
--- a/wmake/makefiles/general
+++ b/wmake/makefiles/general
@@ -38,7 +38,7 @@ endif
 
 
 #------------------------------------------------------------------------------
-# Set the directory containing the wmake scripts
+# Directory containing the wmake scripts
 #------------------------------------------------------------------------------
 
 WM_SCRIPTS      = $(WM_DIR)/scripts
diff --git a/wmake/makefiles/info b/wmake/makefiles/info
index 9475e5799b..3bfa0f5a19 100644
--- a/wmake/makefiles/info
+++ b/wmake/makefiles/info
@@ -19,7 +19,7 @@
 #------------------------------------------------------------------------------
 
 #------------------------------------------------------------------------------
-# Use POSIX shell. Default to POSIX for the OS.
+# Use POSIX shell
 #------------------------------------------------------------------------------
 
 SHELL   = /bin/sh
@@ -63,7 +63,7 @@ ext-so:
 
 .PHONY: compile-c
 compile-c:
-	@echo "$(COMP_C)"
+	@echo "$(COMPILE_C)"
 
 .PHONY: compile-cxx
 compile-cxx:
diff --git a/wmake/src/Makefile b/wmake/src/Makefile
index db22ffe2e5..9c52bf8925 100644
--- a/wmake/src/Makefile
+++ b/wmake/src/Makefile
@@ -32,13 +32,13 @@
 #------------------------------------------------------------------------------
 
 #------------------------------------------------------------------------------
-# The Makefile use a POSIX shell
+# Use POSIX shell
 #------------------------------------------------------------------------------
 
-SHELL      = /bin/sh
+SHELL   = /bin/sh
 
 #------------------------------------------------------------------------------
-# Unset suffices list (suffix rules are not used)
+# No default suffix rules used
 #------------------------------------------------------------------------------
 
 .SUFFIXES:
@@ -62,10 +62,10 @@ include $(GENERAL_RULES)/general
 .PHONY: all clean
 
 all:  $(WMAKE_BIN)/dirToString $(WMAKE_BIN)/wmkdep $(WMAKE_BIN)/wmkdepend
-	@echo built wmake-bin for $(WM_ARCH)$(WM_COMPILER)
+	@echo "built wmake-bin for $(WM_ARCH)$(WM_COMPILER)"
 
 clean:
-	@echo clean wmake-bin for $(WM_ARCH)$(WM_COMPILER)
+	@echo "clean wmake-bin for $(WM_ARCH)$(WM_COMPILER)"
 	@rm -rf $(WMAKE_BIN) 2>/dev/null
 	@rmdir $(shell dirname $(WMAKE_BIN)) 2>/dev/null || true