diff --git a/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C b/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C
index 5440932530..682e249c96 100644
--- a/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C
+++ b/applications/utilities/finiteArea/makeFaMesh/makeFaMesh.C
@@ -218,7 +218,7 @@ int main(int argc, char *argv[])
     {
         label curMeshEdge = meshEdges[edgeI];
 
-        labelList curEdgePatchIDs(2, -1);
+        labelList curEdgePatchIDs(2, label(-1));
 
         label patchI = -1;
 
diff --git a/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
index 48ecae4513..7e391f7d14 100644
--- a/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
@@ -551,7 +551,7 @@ void faMeshDecomposition::decomposeMesh()
 
             const label patchStart = patches[patchI].start();
 
-//             if (typeid(patches[patchI]) != typeid(cyclicFaPatch))
+//             if (!isA<cyclicFaPatch>(patches[patchI]))
             if (true)
             {
                 // Normal patch. Add edges to processor where the face
diff --git a/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructorReconstructFields.C b/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructorReconstructFields.C
index 294f999607..a8aa0aec6f 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructorReconstructFields.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructorReconstructFields.C
@@ -253,7 +253,7 @@ Foam::faFieldReconstructor::reconstructFaAreaField
         // add empty patches
         if
         (
-            typeid(mesh_.boundary()[patchI]) == typeid(emptyFaPatch)
+            isA<emptyFaPatch>(mesh_.boundary()[patchI])
          && !patchFields(patchI)
         )
         {
@@ -533,7 +533,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
         // add empty patches
         if
         (
-            typeid(mesh_.boundary()[patchI]) == typeid(emptyFaPatch)
+            isA<emptyFaPatch>(mesh_.boundary()[patchI])
          && !patchFields(patchI)
         )
         {
diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrix.C b/src/finiteArea/faMatrices/faMatrix/faMatrix.C
index 0e7040f453..b6b6a11440 100644
--- a/src/finiteArea/faMatrices/faMatrix/faMatrix.C
+++ b/src/finiteArea/faMatrices/faMatrix/faMatrix.C
@@ -301,6 +301,19 @@ Foam::faMatrix<Type>::faMatrix
 }
 
 
+template<class Type>
+Foam::tmp<Foam::faMatrix<Type>> Foam::faMatrix<Type>::clone() const
+{
+    return tmp<faMatrix<Type>>
+    (
+        new faMatrix<Type>(*this)
+    );
+}
+
+
+// * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * * //
+
+
 template<class Type>
 Foam::faMatrix<Type>::~faMatrix()
 {
diff --git a/src/finiteArea/faMatrices/faMatrix/faMatrix.H b/src/finiteArea/faMatrices/faMatrix/faMatrix.H
index 8c815e404d..5005dfef1b 100644
--- a/src/finiteArea/faMatrices/faMatrix/faMatrix.H
+++ b/src/finiteArea/faMatrices/faMatrix/faMatrix.H
@@ -207,6 +207,9 @@ public:
             Istream&
         );
 
+        //- Clone
+        tmp<faMatrix<Type>> clone() const;
+
 
     //- Destructor
     virtual ~faMatrix();
diff --git a/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C b/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C
index b110f62e0c..122d178e8e 100644
--- a/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C
+++ b/src/finiteArea/faMatrices/faScalarMatrix/faScalarMatrix.C
@@ -80,7 +80,10 @@ Foam::solverPerformance Foam::faMatrix<Foam::scalar>::solve
         solverControls
     )->solve(psi.ref(), totalSource);
 
-    solverPerf.print(Info);
+    if (solverPerformance::debug)
+    {
+        solverPerf.print(Info);
+    }
 
     diag() = saveDiag;
 
diff --git a/src/finiteArea/faMesh/faMesh.C b/src/finiteArea/faMesh/faMesh.C
index d6706dbd2a..62a53dabdf 100644
--- a/src/finiteArea/faMesh/faMesh.C
+++ b/src/finiteArea/faMesh/faMesh.C
@@ -493,7 +493,7 @@ Foam::faMesh::faMesh
     {
         label curMeshEdge = meshEdges[edgeI];
 
-        labelList curEdgePatchIDs(2, -1);
+        labelList curEdgePatchIDs(2, label(-1));
 
         label patchI = -1;
 
diff --git a/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.C b/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.C
index 6157d9cca1..14b13ed610 100644
--- a/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.C
+++ b/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.C
@@ -29,7 +29,7 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<template<class> class PatchField, class Type>
+template<class Type>
 Foam::tmp<Foam::Field<Type>> Foam::volSurfaceMapping::mapToSurface
 (
     const typename GeometricField<Type, fvPatchField, volMesh>::Boundary& df
diff --git a/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.H b/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.H
index 3b752c78f8..e48955ff90 100644
--- a/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.H
+++ b/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.H
@@ -90,7 +90,7 @@ public:
     // Member Functions
 
         //- Map droplet cloud sources to surface
-        template<template<class> class PatchField, class Type>
+        template<class Type>
         tmp<Field<Type>> mapToSurface
         (
             const typename