diff --git a/src/foam/db/IOobjects/IOdictionary/IOdictionaryIO.C b/src/foam/db/IOobjects/IOdictionary/IOdictionaryIO.C
index 6a01d942c..394a1fa08 100644
--- a/src/foam/db/IOobjects/IOdictionary/IOdictionaryIO.C
+++ b/src/foam/db/IOobjects/IOdictionary/IOdictionaryIO.C
@@ -67,7 +67,7 @@ void Foam::IOdictionary::readFile(const bool masterOnly)
 
         const List<Pstream::commsStruct>& comms =
         (
-            (Pstream::nProcs() < Pstream::nProcsSimpleSum)
+            (Pstream::nProcs() < Pstream::nProcsSimpleSum())
           ? Pstream::linearCommunication()
           : Pstream::treeCommunication()
         );
diff --git a/src/foam/db/regIOobject/regIOobjectRead.C b/src/foam/db/regIOobject/regIOobjectRead.C
index d56250534..a84ab90c5 100644
--- a/src/foam/db/regIOobject/regIOobjectRead.C
+++ b/src/foam/db/regIOobject/regIOobjectRead.C
@@ -204,7 +204,7 @@ bool Foam::regIOobject::read()
 
         const List<Pstream::commsStruct>& comms =
         (
-            (Pstream::nProcs() < Pstream::nProcsSimpleSum)
+            (Pstream::nProcs() < Pstream::nProcsSimpleSum())
           ? Pstream::linearCommunication()
           : Pstream::treeCommunication()
         );
diff --git a/src/foam/global/controlSwitches/controlSwitches.H b/src/foam/global/controlSwitches/controlSwitches.H
index e24472713..2d5549d2f 100644
--- a/src/foam/global/controlSwitches/controlSwitches.H
+++ b/src/foam/global/controlSwitches/controlSwitches.H
@@ -81,18 +81,18 @@ inline bool operator==
     const debug::controlSwitches<T>& rhs
 );
 
-template<class T1, class T2>
+template<class T>
 inline bool operator==
 (
-    const T1& lhs,
-    const debug::controlSwitches<T2>& rhs
+    const T& lhs,
+    const debug::controlSwitches<T>& rhs
 );
 
-template<class T1, class T2>
+template<class T>
 inline bool operator==
 (
-    const debug::controlSwitches<T1>& lhs,
-    const T2& rhs
+    const debug::controlSwitches<T>& lhs,
+    const T& rhs
 );
 
 template<class T>
@@ -102,18 +102,18 @@ inline bool operator!=
     const debug::controlSwitches<T>& rhs
 );
 
-template<class T1, class T2>
+template<class T>
 inline bool operator!=
 (
-    const T1& lhs,
-    const debug::controlSwitches<T2>& rhs
+    const T& lhs,
+    const debug::controlSwitches<T>& rhs
 );
 
-template<class T1, class T2>
+template<class T>
 inline bool operator!=
 (
-    const debug::controlSwitches<T1>& lhs,
-    const T2& rhs
+    const debug::controlSwitches<T>& lhs,
+    const T& rhs
 );
 
 template<class T>
@@ -123,18 +123,18 @@ inline bool operator>=
     const debug::controlSwitches<T>& rhs
 );
 
-template<class T1, class T2>
+template<class T>
 inline bool operator>=
 (
-    const T1& lhs,
-    const debug::controlSwitches<T2>& rhs
+    const T& lhs,
+    const debug::controlSwitches<T>& rhs
 );
 
-template<class T1, class T2>
+template<class T>
 inline bool operator>=
 (
-    const debug::controlSwitches<T1>& lhs,
-    const T2& rhs
+    const debug::controlSwitches<T>& lhs,
+    const T& rhs
 );
 
 template<class T>
@@ -144,18 +144,18 @@ inline bool operator>
     const debug::controlSwitches<T>& rhs
 );
 
-template<class T1, class T2>
+template<class T>
 inline bool operator>
 (
-    const T1& lhs,
-    const debug::controlSwitches<T2>& rhs
+    const T& lhs,
+    const debug::controlSwitches<T>& rhs
 );
 
-template<class T1, class T2>
+template<class T>
 inline bool operator>
 (
-    const debug::controlSwitches<T1>& lhs,
-    const T2& rhs
+    const debug::controlSwitches<T>& lhs,
+    const T& rhs
 );
 
 template<class T>
@@ -165,18 +165,18 @@ inline bool operator<=
     const debug::controlSwitches<T>& rhs
 );
 
-template<class T1, class T2>
+template<class T>
 inline bool operator<=
 (
-    const T1& lhs,
-    const debug::controlSwitches<T2>& rhs
+    const T& lhs,
+    const debug::controlSwitches<T>& rhs
 );
 
-template<class T1, class T2>
+template<class T>
 inline bool operator<=
 (
-    const debug::controlSwitches<T1>& lhs,
-    const T2& rhs
+    const debug::controlSwitches<T>& lhs,
+    const T& rhs
 );
 
 template<class T>
@@ -186,11 +186,11 @@ inline bool operator<
     const debug::controlSwitches<T>& rhs
 );
 
-template<class T1, class T2>
+template<class T>
 inline bool operator<
 (
-    const T1& lhs,
-    const debug::controlSwitches<T2>& rhs
+    const T& lhs,
+    const debug::controlSwitches<T>& rhs
 );
 
 template<class T>
diff --git a/src/foam/global/controlSwitches/controlSwitchesI.H b/src/foam/global/controlSwitches/controlSwitchesI.H
index 51ec9cd2f..e538354c8 100644
--- a/src/foam/global/controlSwitches/controlSwitchesI.H
+++ b/src/foam/global/controlSwitches/controlSwitchesI.H
@@ -41,33 +41,33 @@ inline const T Foam::debug::controlSwitches<T>::operator&(const T& rhs)
 
 // * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
-template<class T1, class T2>
+template<class T>
 inline bool Foam::operator==
 (
-    const debug::controlSwitches<T1>& lhs,
-    const debug::controlSwitches<T2>& rhs
+    const debug::controlSwitches<T>& lhs,
+    const debug::controlSwitches<T>& rhs
 )
 {
     return lhs() == rhs();
 }
 
 
-template<class T1, class T2>
+template<class T>
 inline bool Foam::operator==
 (
-    const T1& lhs,
-    const debug::controlSwitches<T2>& rhs
+    const T& lhs,
+    const debug::controlSwitches<T>& rhs
 )
 {
     return lhs == rhs();
 }
 
 
-template<class T1, class T2>
+template<class T>
 inline bool Foam::operator==
 (
-    const debug::controlSwitches<T1>& lhs,
-    const T2& rhs
+    const debug::controlSwitches<T>& lhs,
+    const T& rhs
 )
 {
     return lhs() == rhs;
@@ -85,22 +85,22 @@ inline bool Foam::operator!=
 }
 
 
-template<class T1, class T2>
+template<class T>
 inline bool Foam::operator!=
 (
-    const T1& lhs,
-    const debug::controlSwitches<T2>& rhs
+    const T& lhs,
+    const debug::controlSwitches<T>& rhs
 )
 {
     return lhs != rhs();
 }
 
 
-template<class T1, class T2>
+template<class T>
 inline bool Foam::operator!=
 (
-    const debug::controlSwitches<T1>& lhs,
-    const T2& rhs
+    const debug::controlSwitches<T>& lhs,
+    const T& rhs
 )
 {
     return lhs() != rhs;
@@ -118,22 +118,22 @@ inline bool Foam::operator>=
 }
 
 
-template<class T1, class T2>
+template<class T>
 inline bool Foam::operator>=
 (
-    const T1& lhs,
-    const debug::controlSwitches<T2>& rhs
+    const T& lhs,
+    const debug::controlSwitches<T>& rhs
 )
 {
     return lhs >= rhs();
 }
 
 
-template<class T1, class T2>
+template<class T>
 inline bool Foam::operator>=
 (
-    const debug::controlSwitches<T1>& lhs,
-    const T2& rhs
+    const debug::controlSwitches<T>& lhs,
+    const T& rhs
 )
 {
     return lhs() >= rhs;
@@ -151,22 +151,22 @@ inline bool Foam::operator>
 }
 
 
-template<class T1, class T2>
+template<class T>
 inline bool Foam::operator>
 (
-    const T1& lhs,
-    const debug::controlSwitches<T2>& rhs
+    const T& lhs,
+    const debug::controlSwitches<T>& rhs
 )
 {
     return lhs > rhs();
 }
 
 
-template<class T1, class T2>
+template<class T>
 inline bool Foam::operator>
 (
-    const debug::controlSwitches<T1>& lhs,
-    const T2& rhs
+    const debug::controlSwitches<T>& lhs,
+    const T& rhs
 )
 {
     return lhs() > rhs;
@@ -184,22 +184,22 @@ inline bool Foam::operator<=
 }
 
 
-template<class T1, class T2>
+template<class T>
 inline bool Foam::operator<=
 (
-    const T1& lhs,
-    const debug::controlSwitches<T2>& rhs
+    const T& lhs,
+    const debug::controlSwitches<T>& rhs
 )
 {
     return lhs <= rhs();
 }
 
 
-template<class T1, class T2>
+template<class T>
 inline bool Foam::operator<=
 (
-    const debug::controlSwitches<T1>& lhs,
-    const T2& rhs
+    const debug::controlSwitches<T>& lhs,
+    const T& rhs
 )
 {
     return lhs() <= rhs;
@@ -217,22 +217,22 @@ inline bool Foam::operator<
 }
 
 
-template<class T1, class T2>
+template<class T>
 inline bool Foam::operator<
 (
-    const T1& lhs,
-    const debug::controlSwitches<T2>& rhs
+    const T& lhs,
+    const debug::controlSwitches<T>& rhs
 )
 {
     return lhs < rhs();
 }
 
 
-template<class T1, class T2>
+template<class T>
 inline bool Foam::operator<
 (
-    const debug::controlSwitches<T1>& lhs,
-    const T2& rhs
+    const debug::controlSwitches<T>& lhs,
+    const T& rhs
 )
 {
     return lhs() < rhs;
diff --git a/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C b/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
index 2d7469d40..acd12b631 100644
--- a/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
+++ b/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
@@ -132,7 +132,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
         // Try and consume interfaces as they become available
         bool allUpdated = false;
 
-        for (label i = 0; i < Pstream::nPollProcInterfaces; i++)
+        for (label i = 0; i < Pstream::nPollProcInterfaces(); i++)
         {
             allUpdated = true;
 
diff --git a/src/thermophysicalModels/specie/thermo/realGasThermo/realGasSpecieThermo/realGasSpecieThermoI.H b/src/thermophysicalModels/specie/thermo/realGasThermo/realGasSpecieThermo/realGasSpecieThermoI.H
index 61012c145..67e31c38b 100755
--- a/src/thermophysicalModels/specie/thermo/realGasThermo/realGasSpecieThermo/realGasSpecieThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/realGasThermo/realGasSpecieThermo/realGasSpecieThermoI.H
@@ -89,7 +89,7 @@ inline void Foam::realGasSpecieThermo<thermo>::T
             )
         );
 
-        if (iter++ > maxIter_)
+        if (iter++ > maxIter_())
         {
             FatalErrorIn
             (