diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePair.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePair.H
index 413bda2b045fb7e9cf44031e65406c7182a9adb2..02dd12e2b1cda1ab4627f256853befa35f658264 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePair.H
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePair.H
@@ -22,11 +22,11 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::phasePair description for mass transfer between a pair of
-    phases. The direction of the mass transfer is from the phase
-    'from' to the phasse 'to'.
+    Foam::phasePair
 
 Description
+    Description for mass transfer between a pair of phases. The direction of
+    the mass transfer is from the phase 'from' to the phasse 'to'.
 
 SourceFiles
     phasePair.C
diff --git a/bin/foamLog b/bin/foamLog
index 021b93524399be90c6632d365d2ad9bffdaa0002..facdf586078f238589e0c4174485641a6872ee48 100755
--- a/bin/foamLog
+++ b/bin/foamLog
@@ -241,7 +241,7 @@ getAllQueries()
     #-- Add ones from database, present in log file
     # Note: just like awk, line selected with regular expression,
     #       column with string.
-    local dbQueries=$(getDbQueryList $db)
+    local dbQueries="$(getDbQueryList $db)"
 
     for var in $dbQueries
     do
diff --git a/src/OpenFOAM/containers/Bits/PackedList/PackedList.H b/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
index d4e4399c41b0eb297c71a2853b19212cce0fb0a0..c30710c02fd86b90b394e189ce33fdeaf48e9aec 100644
--- a/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Bits/PackedList/PackedList.H
@@ -157,7 +157,7 @@ public:
         // \code
         //     (numElem / elem_per_block)
         //   + (numElem % elem_per_block) ? 1 : 0
-        // \code
+        // \endcode
         // But avoiding the modulus operation
         static constexpr label num_blocks(label numElem)
         {
@@ -498,7 +498,6 @@ public:
             Ostream& os,
             const PackedList<Width>& list
         );
-
 };
 
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index 6bd43b8c9e6c82cf4c679a6fd695d5a71b866daf..7d19a907caed6019f23de4e0ec1e6441ccf53790 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -32,7 +32,7 @@ Description
     field and derived quantities.  Alternatively, the same actions can be
     executed after the simulation using the \c -postProcess command-line option.
 
-    \subsection secFunctionObjects Using function objects
+    \section secFunctionObjects Using function objects
 
     FunctionObjects are selected by additional entries in the
     $FOAM_CASE/system/controlDict dictionary.  Each object is listed in the \c
diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
index 9070362dad6acea98abdedd9675d68ac06a42ade..ef436ffa70d514fdb189a2e912402a5b6b41ba4c 100644
--- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
@@ -29,9 +29,9 @@ Description
 
     In parallel it will assume ranks are sorted according to hostname
     and the lowest rank per hostname will be the IO rank. The output directories
-    will get a unique name processors<N>_<low>-<high> where N is the overall
-    number of processors and low and high is the range of ranks contained
-    in the files. Each of these subsets uses its own communicator.
+    will get a unique name processors\<N\>_\<low\>-\<high\> where N is the
+    overall number of processors and low and high is the range of ranks
+    contained in the files. Each of these subsets uses its own communicator.
 
     Instead of using the hostnames the IO ranks can be assigned using the
     FOAM_IORANKS environment variable (also when running non-parallel), e.g.
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
index 545f20041b7975d041400e0fe82770e58a8f4373..c2887e65ec9a698ace70546caab98d47ae7651b6 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
@@ -28,8 +28,9 @@ Description
     fileOperations that performs all file operations on the master processor.
     Requires the calls to be parallel synchronised!
 
-    Limitations: - no /processor in filename
-                 - no /uniform/ in the filename
+    Limitations
+    - no /processor in filename
+    - no /uniform/ in the filename
 
     The main logic is in ::filePath which returns a
     - same path on all processors. This can either be a global file
@@ -40,12 +41,12 @@ Description
     - different path on all processors (processor0/0/p)
 
     system/controlDict:
-    filePath worldmaster: <globalRoot>/system/controlDict
+    filePath worldmaster: \<globalRoot\>/system/controlDict
              localmaster:           ,,
              slave      :           ,,
 
     processor0/uniform/time
-    filePath worldmaster: <globalRoot>/processorXXX/uniform/time
+    filePath worldmaster: \<globalRoot\>/processorXXX/uniform/time
              localmaster:           ,,
              slave      :           ,,
 
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
index c8bfbb5bac7d0ef29ca906855f9fc4da4b40bf36..448aa5ffcf5ddebe76842987536786ec303095a8 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
@@ -279,6 +279,7 @@ public:
         //
         //      if (nOrig == zones.size()) { existing... } else { new... }
         //  \endcode
+        //  \param zoneName the name of the zone
         //  \param verbose report if an existing zone was selected or
         //      a new zone was created.
         //  \return non-const reference to the existing or new zone
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
index ae7066f96e537721740bbe5064b20d0defcc45b3..d46a53e00b09c49533c5e7a31548cb38c3cb3d53 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
@@ -86,6 +86,12 @@ public:
         //- Copy constructor
         explicit Table(const Table<Type>& tbl);
 
+        //- Construct and return a clone
+        virtual tmp<Function1<Type>> clone() const
+        {
+            return tmp<Function1<Type>>(new Table<Type>(*this));
+        }
+
 
     //- Destructor
     virtual ~Table();
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.H b/src/OpenFOAM/primitives/strings/stringOps/stringOps.H
index 6a483affa24209994927684b74146a01b59760b2..85414c90087dd1d612e762837735849b0328d2da 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.H
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.H
@@ -218,10 +218,10 @@ namespace stringOps
     //  -# current directory
     //    - leading "./" : the current directory
     //  -# leading tag expansion for commonly used directories
-    //    - <etc>/        : user/group/other OpenFOAM directory
-    //    - <case>/       : FOAM_CASE directory
-    //    - <constant>/   : FOAM_CASE/constant directory
-    //    - <system>/     : FOAM_CASE/system directory
+    //    - \<etc\>/        : user/group/other OpenFOAM directory
+    //    - \<case\>/       : FOAM_CASE directory
+    //    - \<constant\>/   : FOAM_CASE/constant directory
+    //    - \<system\>/     : FOAM_CASE/system directory
     //  -# tilde expansion
     //    - leading "~/" : home directory
     //    - leading "~user" : home directory for specified user
@@ -258,10 +258,10 @@ namespace stringOps
     //  -# current directory
     //    - leading "./" : the current directory
     //  -# leading tag expansion for commonly used directories
-    //    - <etc>/        : user/group/other OpenFOAM directory
-    //    - <case>/       : FOAM_CASE directory
-    //    - <constant>/   : FOAM_CASE/constant directory
-    //    - <system>/     : FOAM_CASE/system directory
+    //    - \<etc\>/        : user/group/other OpenFOAM directory
+    //    - \<case\>/       : FOAM_CASE directory
+    //    - \<constant\>/   : FOAM_CASE/constant directory
+    //    - \<system\>/     : FOAM_CASE/system directory
     //  -# tilde expansion
     //    - leading "~/" : home directory
     //    - leading "~user" : home directory for specified user
diff --git a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C
index 805d0ca16b65a921d0a9dba13144fcd761693832..6686114c1dea0d775063c7950310da45753b6600 100644
--- a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C
+++ b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2018 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,14 +50,12 @@ void kEpsilonLopesdaCosta<BasicTurbulenceModel>::setPorosityCoefficient
 
         const scalar Cpm = readScalar(pm.dict().lookup(C.name()));
 
-        forAll(cellZoneIDs, zonei)
+        for (const label zonei : cellZoneIDs)
         {
-            const labelList& cells =
-                this->mesh_.cellZones()[cellZoneIDs[zonei]];
+            const labelList& cells = this->mesh_.cellZones()[zonei];
 
-            forAll(cells, i)
+            for (const label celli : cells)
             {
-                const label celli = cells[i];
                 C[celli] = Cpm;
             }
         }
@@ -79,15 +77,14 @@ void kEpsilonLopesdaCosta<BasicTurbulenceModel>::setCdSigma
 
         const scalar Cpm = readScalar(pm.dict().lookup(C.name()));
 
-        forAll(cellZoneIDs, zonei)
+        for (const label zonei : cellZoneIDs)
         {
-            const labelList& cells =
-                this->mesh_.cellZones()[cellZoneIDs[zonei]];
+            const labelList& cells = this->mesh_.cellZones()[zonei];
 
             forAll(cells, i)
             {
                 const label celli = cells[i];
-                C[celli] = Cpm*Sigma[celli];
+                C[celli] = Cpm*Sigma[i];
             }
         }
     }
@@ -115,10 +112,13 @@ void kEpsilonLopesdaCosta<BasicTurbulenceModel>::setPorosityCoefficients()
                     );
 
                 setPorosityCoefficient(Cmu_, pm);
+                Cmu_.correctBoundaryConditions();
                 setPorosityCoefficient(C1_, pm);
                 setPorosityCoefficient(C2_, pm);
                 setPorosityCoefficient(sigmak_, pm);
                 setPorosityCoefficient(sigmaEps_, pm);
+                sigmak_.correctBoundaryConditions();
+                sigmaEps_.correctBoundaryConditions();
 
                 setCdSigma(CdSigma_, pm);
                 setPorosityCoefficient(betap_, pm);
diff --git a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.H b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.H
index 4957f2641b3bea951e81a885aaa88af82e584b75..d5914bcafe64b02f3dbd71221061f15671a0ff6e 100644
--- a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.H
+++ b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::powerLawLopesdaCosta
+    Foam::porosityModels::powerLawLopesdaCosta
 
 Description
     Variant of the power law porosity model with spatially varying
@@ -105,7 +105,7 @@ public:
 
 
 /*---------------------------------------------------------------------------*\
-                      Class powerLawLopesdaCosta Declaration
+                    Class powerLawLopesdaCosta Declaration
 \*---------------------------------------------------------------------------*/
 
 class powerLawLopesdaCosta
diff --git a/src/combustionModels/EDC/EDC.H b/src/combustionModels/EDC/EDC.H
index 5cda96b6f6ede430ca60f8042228546d4c91cb39..fdddde56be428e28c3df9a248bd5926ff54a010b 100644
--- a/src/combustionModels/EDC/EDC.H
+++ b/src/combustionModels/EDC/EDC.H
@@ -35,7 +35,7 @@ Description
     There are many versions and developments of the EDC model, 4 of which are
     currently supported in this implementation: v1981, v1996, v2005 and
     v2016.  The model variant is selected using the optional \c version entry in
-    the \c EDCCoeffs dictionary, \eg
+    the \c EDCCoeffs dictionary, e.g.
 
     \verbatim
         EDCCoeffs
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.C
index 6992db05b0798c045f30437d875383fe1b9817e9..49672e704b35c71a6b71b80dacf6667ab9405d13 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -117,8 +117,9 @@ Foam::multiSolidBodyMotionSolver::multiSolidBodyMotionSolver
             pointIDs_[zonei].transfer(ptIDs);
 
             Info<< "Applying solid body motion " << SBMFs_[zonei].type()
-                << " to " << pointIDs_[zonei].size() << " points of cellZone "
-                << iter().keyword() << endl;
+                << " to "
+                << returnReduce(pointIDs_[zonei].size(), sumOp<label>())
+                << " points of cellZone " << iter().keyword() << endl;
 
             zonei++;
         }
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/loopControl/loopControl.H b/src/finiteVolume/cfdTools/general/solutionControl/loopControl/loopControl.H
index 2190a00502d378d934cf58c2e418d70973124850..42b206080f651870cb1230e444963c4c50c6e906 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/loopControl/loopControl.H
+++ b/src/finiteVolume/cfdTools/general/solutionControl/loopControl/loopControl.H
@@ -45,6 +45,7 @@ Usage
             }
         }
     }
+    \endverbatim
 
     Where the loop entries comprise:
     \table
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.H
index 2903f2002b8a8f4d9c7212fcdc31e735ce2e0274..31767113fe24b5bcd819d23b9f6565c97e1ae36f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.H
@@ -45,8 +45,8 @@ Description
     except that no interpolation in time is supported.  These should be
     located in the directory:
 
-        \$FOAM_CASE/constant/boundaryData/<patchName>/points
-        \$FOAM_CASE/constant/boundaryData/<patchName>/0/\{R|U|L\}
+        \$FOAM_CASE/constant/boundaryData/\<patchName\>/points
+        \$FOAM_CASE/constant/boundaryData/\<patchName\>/0/\{R|U|L\}
 
 
 Usage
diff --git a/src/functionObjects/field/CourantNo/CourantNo.H b/src/functionObjects/field/CourantNo/CourantNo.H
index 26c467525e393e10557ad13a769e60a7d24bfb0a..f65e61048cb0611b48511ede31619836ca12fb49 100644
--- a/src/functionObjects/field/CourantNo/CourantNo.H
+++ b/src/functionObjects/field/CourantNo/CourantNo.H
@@ -49,7 +49,7 @@ Usage
         type         | Type name: CourantNo    | yes         |
         rho          | Name of density field   | no          | rho
         field        | Name of flux field      | no          | phi
-        result       | Name of Courant number field | no     | <function name>
+        result       | Name of Courant number field | no     | \<function name\>
         log          | Log to standard output  | no          | yes
     \endtable
 
diff --git a/src/functionObjects/field/DESModelRegions/DESModelRegions.H b/src/functionObjects/field/DESModelRegions/DESModelRegions.H
index 8119b9d738b75345cb08172750262d7c8964d5a6..6223bcb4a43e4e4a9bbaaa6d33a95cc833860349 100644
--- a/src/functionObjects/field/DESModelRegions/DESModelRegions.H
+++ b/src/functionObjects/field/DESModelRegions/DESModelRegions.H
@@ -51,7 +51,7 @@ Usage
     \table
         Property     | Description             | Required    | Default value
         type         | type name: DESModelRegions| yes       |
-        resultName   | Name of DES indicator field | no      | <function name>
+        resultName   | Name of DES indicator field | no      | \<function name\>
         log          | log to standard output  | no          | yes
     \endtable
 
diff --git a/src/functionObjects/field/PecletNo/PecletNo.H b/src/functionObjects/field/PecletNo/PecletNo.H
index bb6bf485970f5413503d2c6715b5f44f5c0f5740..a52904fff5a13f9f31967da9d435558fd0c75087 100644
--- a/src/functionObjects/field/PecletNo/PecletNo.H
+++ b/src/functionObjects/field/PecletNo/PecletNo.H
@@ -47,7 +47,7 @@ Usage
         type         | type name: Peclet       | yes         |
         phi          | Name of flux field      | no          | phi
         rho          | Name of density field   | no          | rho
-        result       | Name of Peclet field    | no          | <function name>
+        result       | Name of Peclet field    | no          | \<function name\>
         log          | Log to standard output  | no          | yes
     \endtable
 
diff --git a/src/functionObjects/field/Q/Q.H b/src/functionObjects/field/Q/Q.H
index ca2cc1b7445447483ff3945b7c6d6d754d52f384..4bf3a08199e7b828f5d6e45c1a60528488cfbbcb 100644
--- a/src/functionObjects/field/Q/Q.H
+++ b/src/functionObjects/field/Q/Q.H
@@ -56,7 +56,7 @@ Usage
         Property     | Description             | Required    | Default value
         type         | type name: Q            | yes         |
         U            | Name of velocity field  | no          | U
-        result       | Name of Q field         | no          | <function name>
+        result       | Name of Q field         | no          | \<function name\>
         log          | Log to standard output  | no          | yes
     \endtable
 
diff --git a/src/functionObjects/field/blendingFactor/blendingFactor.H b/src/functionObjects/field/blendingFactor/blendingFactor.H
index cac6b782d9e59c7994e59398d775a6e1ba67d69d..4db4dec3d0c0d59c673bc5a4c93f136a83eb3fb7 100644
--- a/src/functionObjects/field/blendingFactor/blendingFactor.H
+++ b/src/functionObjects/field/blendingFactor/blendingFactor.H
@@ -42,7 +42,7 @@ Description
     The factor is a face-based quantity, which is converted to a cell-based
     quantity by assigning the minimum blending factor for any cell face.
 
-    An indicator (volume) field, named <functionObjectName>:<fieldName>, is
+    An indicator (volume) field, named \<functionObjectName\>:\<fieldName\>, is
     generated that is set to (1 - f), i.e. values of:
     - 0 represent scheme1 as active, and
     - 1 represent scheme2 as active.
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.H b/src/functionObjects/field/fluxSummary/fluxSummary.H
index 1677d826a01da850b479679ef016e2ad8a970e34..324ce7c4733cff016776a8fcae7f11f3e666d3d4 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.H
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.H
@@ -71,7 +71,7 @@ Usage
     - surface
     - surfaceAndDirection
 
-    Output data is written to files of the form \<timeDir\>/<faceZoneName>.dat
+    Output data is written to files of the form \<timeDir\>/\<faceZoneName\>.dat
 
 See also
     Foam::functionObjects::fvMeshFunctionObject
diff --git a/src/functionObjects/field/mapFields/mapFields.H b/src/functionObjects/field/mapFields/mapFields.H
index fa5fc85151a156e1bfa970eae377e1d45ed80159..4d80b1baa77293b8773f18e752bac4ee864b3d45 100644
--- a/src/functionObjects/field/mapFields/mapFields.H
+++ b/src/functionObjects/field/mapFields/mapFields.H
@@ -53,7 +53,7 @@ Usage
         type         | Type name: mapFields       | yes       |
         mapRegion    | Name of region to map to   | yes       |
         mapMethod    | Mapping method             | yes       |
-        patchMapMethod | Patch mapping method     | no        | <auto>
+        patchMapMethod | Patch mapping method     | no        | \<auto\>
         consistent   | Mapping meshes have consistent boundaries | yes |
         fields       | List of field names to map | yes       |
         log          | Log to standard output     | no        | yes
diff --git a/src/functionObjects/field/reference/reference.H b/src/functionObjects/field/reference/reference.H
index 07621cdd6edda91aa06f120df98f4b09e4c3f3cd..d1dd0c36f4528103aed09ea99231c524b58e7f11 100644
--- a/src/functionObjects/field/reference/reference.H
+++ b/src/functionObjects/field/reference/reference.H
@@ -67,8 +67,8 @@ Usage
         Property     | Description             | Required | Default value
         type         | Type name: reference    | yes      |
         field        | Name of field           | yes      |
-        result       | Name of result field    | no       | reference(<field>)
-        position     | Position to sample      | no       | <not used>
+        result       | Name of result field    | no       | reference(\<field\>)
+        position     | Position to sample      | no       | \<not used\>
         scale        | Scale value             | no       | 1
         offset       | Offset value            | no       | zero
         log          | Log to standard output  | no       | yes
diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
index 98776a4d2a7748c1efa3503af442a4d9c124a31f..9d58a323fd29b53e3f0c0ad1fa74e364a6c10c83 100644
--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.H
@@ -63,7 +63,7 @@ Description
                     ),
                     1.0
                 )
-        \f[
+        \f]
 
     For option 2, the following relation is used:
         \f[
@@ -78,7 +78,7 @@ Description
                     ),
                     1.0
                 )
-        \f[
+        \f]
     Note that  magGradCC is equal to 3 for ortoghonal meshes
 
     For option 3 a PID control is used in order to control residual
@@ -89,14 +89,14 @@ Description
                 P*residual
               + I*residualIntegral
               + D*residualDifferential
-        \f[
+        \f]
 
         where P, I and D are user inputs
 
     The following relation is used:
     \f[
         fRes = (factor - meanRes)/(maxRes*meanRes);
-    \f[
+    \f]
 
         where:
             meanRes = average(residual)
@@ -120,7 +120,7 @@ Description
                 ),
                 1.0
             )
-        \f[
+        \f]
     Note that faceWeights for a orthogonal mesh is 0.5.
 
 
@@ -138,7 +138,7 @@ Description
                 ),
                 1.0
             )
-        \f[
+        \f]
 
 
     For option 6 , the following relation is used:
@@ -275,8 +275,7 @@ Usage
         tolerance    | Tolerance for number of blended cells | no | 0.001
         field        | Name of field to evaluate | yes       |
         result    | Name of surface field to be used in the localBlended scheme
-        | yes
-
+        | yes |
     \endtable
 
     The 'log' flag true write the number of cells on each scheme, plus it
diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.H b/src/functionObjects/solvers/scalarTransport/scalarTransport.H
index df11dabe423b514869bef07529a6fadc370e4b97..bed7201e690b36c2b975043fb7a03c3ac5c1535e 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.H
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.H
@@ -48,6 +48,7 @@ Description
 Usage
     Example of function object specification to solve a scalar transport
     equation:
+    \verbatim
     functions
     {
         scalar1
diff --git a/src/overset/include/setCellMask.H b/src/overset/include/setCellMask.H
index 92e187ee596f479ba49351ddd8cbad4eb4f97de7..1a57b79b6685b39ff967e43bd298ba4ca166fadb 100644
--- a/src/overset/include/setCellMask.H
+++ b/src/overset/include/setCellMask.H
@@ -21,13 +21,9 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Class
-
 Description
     Sets blocked cells mask field
 
-SourceFiles
-
 \*---------------------------------------------------------------------------*/
 
 {
diff --git a/src/overset/include/setInterpolatedCells.H b/src/overset/include/setInterpolatedCells.H
index 6b3cac9e85429103105673de250153f7285bbe8d..d33755e96a2c5fd59c400911849c69b4262a6764 100644
--- a/src/overset/include/setInterpolatedCells.H
+++ b/src/overset/include/setInterpolatedCells.H
@@ -21,13 +21,9 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Class
-
 Description
     Sets blocked cells mask field
 
-SourceFiles
-
 \*---------------------------------------------------------------------------*/
 
 {
diff --git a/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C b/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C
index be2e2f47317585f18bd13ac8a2d9a12671572785..71e70116758935277619c192b5a8e3005e0f9e65 100644
--- a/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C
+++ b/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C
@@ -87,7 +87,7 @@ Foam::viscosityModels::BirdCarreau::BirdCarreau
     (
         IOobject
         (
-            "nu",
+            name,
             U_.time().timeName(),
             U_.db(),
             IOobject::NO_READ,
diff --git a/src/transportModels/incompressible/viscosityModels/Casson/Casson.C b/src/transportModels/incompressible/viscosityModels/Casson/Casson.C
index fedca4b7602c4ad1064eafd7fd4d1aa5e3374655..580b3497f44a27adbb1b0720a5295cf4dd5a827a 100644
--- a/src/transportModels/incompressible/viscosityModels/Casson/Casson.C
+++ b/src/transportModels/incompressible/viscosityModels/Casson/Casson.C
@@ -92,7 +92,7 @@ Foam::viscosityModels::Casson::Casson
     (
         IOobject
         (
-            "nu",
+            name,
             U_.time().timeName(),
             U_.db(),
             IOobject::NO_READ,
diff --git a/wmake/scripts/have_kahip b/wmake/scripts/have_kahip
index 3dcf7c952b7340d09543e8204cf7c856254d8813..b1b722b9af2e786148cb1a3ac971559ac385e1e3 100644
--- a/wmake/scripts/have_kahip
+++ b/wmake/scripts/have_kahip
@@ -83,10 +83,10 @@ have_kahip()
         # FOAM_EXT_LIBBIN is allowed to be unset
         library=$(findFirstFile \
             $FOAM_EXT_LIBBIN/$library \
-            $METIS_ARCH_PATH/lib/$static \
-            $METIS_ARCH_PATH/lib/$library \
-            $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$static \
-            $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$library \
+            $KAHIP_ARCH_PATH/lib/$static \
+            $KAHIP_ARCH_PATH/lib/$library \
+            $KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$static \
+            $KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$library \
         )
     elif isSystem "$KAHIP_ARCH_PATH"
     then