diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
index ed8acb579c..b705e36409 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
@@ -1,5 +1,8 @@
+/* Add to EXE_INC as required:
+   -g -DFULLDEBUG -O0
+ */
+
 EXE_INC = \
-    /* -g -DFULLDEBUG -O0 */ \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Make/options b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
index e2343e6ee6..d1432ae98c 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
@@ -1,5 +1,8 @@
+/* Add to EXE_INC as required:
+   -DFULLDEBUG -g -O0
+ */
+
 EXE_INC = \
-    /* -DFULLDEBUG -g -O0 */ \
     ${COMP_FLAGS} \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
diff --git a/applications/utilities/mesh/manipulation/zipUpMesh/Make/options b/applications/utilities/mesh/manipulation/zipUpMesh/Make/options
index 082ffae98e..cf29c6e33c 100644
--- a/applications/utilities/mesh/manipulation/zipUpMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/zipUpMesh/Make/options
@@ -1,8 +1,11 @@
+/* Add to EXE_INC as required:
+   -DDEBUG_ZIPUP
+   -DDEBUG_CHAIN
+   -DDEBUG_ORDER
+ */
+
 EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    /* -DDEBUG_ZIPUP */ \
-    /* -DDEBUG_CHAIN */ \
-    /* -DDEBUG_ORDER */
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -lmeshTools
diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index b097a3646f..c3710b59fe 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -28,18 +28,17 @@
 #     For central installations not located under ThirdParty, the environment
 #     values must be set manually. For example,
 #
-#         setenv ParaView_DIR /opt/paraview/paraview-5.4.1
-#         setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-5.4
-#         setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview-5.4
+#         setenv ParaView_DIR /opt/paraview/paraview-5.5.0
+#         setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-5.5
+#         setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview-5.5
 #
-#         setenv PATH ${ParaView_DIR}/bin:${PATH}
-#         setenv LD_LIBRARY_PATH ${ParaView_DIR}/lib/paraview-5.4:${LD_LIBRARY_PATH}
+#         setenv PATH $ParaView_DIR/bin:${PATH}
+#         setenv LD_LIBRARY_PATH $ParaView_DIR/lib:$LD_LIBRARY_PATH
 #         unsetenv ParaView_VERSION     # avoid using ThirdParty settings
 #
-#     In newer versions (paraview 5.5), the contents of the lib/ changed
-#     and now need to include that as well:
+#     In paraview-5.4 and earlier, the libraries were in the sub-directory:
 #
-#         setenv LD_LIBRARY_PATH ${ParaView_DIR}/lib:${ParaView_DIR}/lib/paraview-5.5:${LD_LIBRARY_PATH}
+#         setenv LD_LIBRARY_PATH $ParaView_DIR/lib/paraview-5.4:$LD_LIBRARY_PATH
 #
 #------------------------------------------------------------------------------
 # USER EDITABLE PART: Changes made here may be lost with the next upgrade
@@ -50,7 +49,7 @@ set cmake_version=cmake-system
 
 # END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
-set pv_api=auto         # Either auto or pair of digits (eg, '5.4' etc)
+set pv_api=auto         # Either auto or pair of (major.minor) digits
 
 if (! $?ParaView_DIR ) setenv ParaView_DIR
 if (! $?WM_COMPILER_LIB_ARCH ) setenv WM_COMPILER_LIB_ARCH
diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index aaa5470b0b..9acf55892b 100644
--- a/etc/config.sh/CGAL
+++ b/etc/config.sh/CGAL
@@ -34,7 +34,7 @@
 #
 #     When _foamAddLibAuto is unset (eg, called from makeCGAL):
 #       - boost_version / cgal_version variables are retained.
-#       - the LD_LIBRARY_PATH is not adjusted.
+#       - the lib-path is not adjusted.
 #
 #     Can also disable by renaming/removing this file or by creating an empty
 #     file with the same name at a user or site location.
diff --git a/etc/config.sh/FFTW b/etc/config.sh/FFTW
index 854bc81917..f20d2b5421 100644
--- a/etc/config.sh/FFTW
+++ b/etc/config.sh/FFTW
@@ -26,7 +26,7 @@
 # Note
 #     When _foamAddLibAuto is unset (eg, called from makeFFTW):
 #       - fftw_version variable is retained.
-#       - LD_LIBRARY_PATH is not adjusted.
+#       - the lib-path is not adjusted.
 #
 #     Can also disable by renaming/removing this file or by creating an empty
 #     file with the same name at a user or site location.
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index bfab3b36de..553378c472 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -28,18 +28,17 @@
 #     For central installations not located under ThirdParty, the environment
 #     values must be set manually. For example,
 #
-#         export ParaView_DIR=/opt/paraview/paraview-5.4.1
-#         export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-5.4
-#         export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-5.4
+#         export ParaView_DIR=/opt/paraview/paraview-5.5.0
+#         export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-5.5
+#         export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-5.5
 #
 #         export PATH=$ParaView_DIR/bin:$PATH
-#         export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-5.4:$LD_LIBRARY_PATH
+#         export LD_LIBRARY_PATH=$ParaView_DIR/lib:$LD_LIBRARY_PATH
 #         unset ParaView_VERSION        # avoid using ThirdParty settings
 #
-#     In newer versions (paraview 5.5), the contents of the lib/ changed
-#     and now need to include that as well:
+#     In paraview-5.4 and earlier, the libraries were in the sub-directory:
 #
-#         export LD_LIBRARY_PATH=$ParaView_DIR/lib:$ParaView_DIR/lib/paraview-5.5:$LD_LIBRARY_PATH
+#         export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-5.4:$LD_LIBRARY_PATH
 #
 # Note
 #     When _foamAddLib is unset (eg, called from makeParaView or from foamPV):
@@ -53,7 +52,7 @@ cmake_version=cmake-system
 
 # END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
-pv_api=auto             # Either auto or pair of digits (eg, '5.4' etc)
+pv_api=auto             # Either auto or pair of (major.minor) digits
 
 # Compiler-specific location for ThirdParty installations
 archDir="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER"
diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index 9204f333c8..bb7d71a2c4 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -106,7 +106,6 @@ Operating system '$WM_ARCH' has incomplete support in this OpenFOAM release.
 For further assistance, please contact www.OpenFOAM.com
 ===============================================================================
 INCOMPLETE
-    echo "Darwin support ($WM_ARCH) is incomplete" 1>&2
     ;;
 
 SunOS)
diff --git a/src/conversion/ccm/Make/options b/src/conversion/ccm/Make/options
index 17c07c6824..cf88c1aa63 100644
--- a/src/conversion/ccm/Make/options
+++ b/src/conversion/ccm/Make/options
@@ -1,7 +1,10 @@
+/* Add to EXE_INC as required:
+   -DWITH_MONITORING -DDEBUG_MONITORING
+   -DDEBUG_BAFFLES
+   -DDEBUG_CCMIOREAD
+ */
+
 EXE_INC = \
-    /* -DWITH_MONITORING -DDEBUG_MONITORING */ \
-    /* -DDEBUG_BAFFLES */ \
-    /* -DDEBUG_CCMIOREAD */ \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
diff --git a/src/overset/Make/options b/src/overset/Make/options
index ae7529a227..fc6854c46f 100644
--- a/src/overset/Make/options
+++ b/src/overset/Make/options
@@ -1,5 +1,8 @@
+/* Add to EXE_INC as required:
+   -DFULLDEBUG -O0 -g
+ */
+
 EXE_INC = \
-    /* -DFULLDEBUG -O0 -g */ \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
diff --git a/wmake/scripts/have_scotch b/wmake/scripts/have_scotch
index 2ad72ec4c6..bf613acf39 100644
--- a/wmake/scripts/have_scotch
+++ b/wmake/scripts/have_scotch
@@ -118,7 +118,7 @@ have_scotch()
     # Ensure consistent sizes between OpenFOAM and scotch header
     # extract 'typedef int64_t SCOTCH_Num' or equivalent
     label=$(sed -ne \
-        's/^.*typedef *\([^ ]*\) *SCOTCH_Num.*/\1/ip' \
+        's/^.*typedef *\([^ ]*\) *SCOTCH_Num.*/\1/p' \
         "$header")
     : ${label:=unknown} # Failsafe value
 
diff --git a/wmake/wmakeLnInclude b/wmake/wmakeLnInclude
index b648960cd2..d31cf08b3c 100755
--- a/wmake/wmakeLnInclude
+++ b/wmake/wmakeLnInclude
@@ -67,10 +67,7 @@ USAGE
 # Parse arguments and options
 #------------------------------------------------------------------------------
 
-# Default 'find' option
-unset findOpt
-
-# Default 'ln' option
+# Option for 'ln'
 lnOpt="-s"
 
 unset update silentOpt
@@ -149,23 +146,31 @@ fi
 #------------------------------------------------------------------------------
 # Remove any broken links first (this helps when file locations have moved)
 #------------------------------------------------------------------------------
-find -L . -type l -delete
+
+case "$WM_ARCH" in
+darwin*)
+    find -L . -type l -exec rm -- {} \+
+    ;;
+*)
+    find -L . -type l -delete
+    ;;
+esac
 
 
 #------------------------------------------------------------------------------
 # Create links, avoid recreating links unless necessary
 # things placed in the 'noLink' directory are skipped
 #------------------------------------------------------------------------------
-find .. $findOpt \
-     \( -name lnInclude -o -name Make -o -name config -o -name noLink \) \
-     -prune \
-     -o \( \
-     -name '*.[CHh]' \
-     -o -name '*.[ch]xx' \
-     -o -name '*.[ch]pp' \
-     -o -name '*.type' \
-     \)  \
-     -exec ln $lnOpt {} . \;
+find .. \
+    \( -name lnInclude -o -name Make -o -name config -o -name noLink \) \
+    -prune \
+    -o \( \
+        -name '*.[CHh]' \
+        -o -name '*.[ch]xx' \
+        -o -name '*.[ch]pp' \
+        -o -name '*.type' \
+    \)  \
+    -exec ln $lnOpt {} . \;
 
 exit 0 # clean exit