diff --git a/src/engine/engineValve/valveBank.H b/src/engine/engineValve/valveBank.H
deleted file mode 100644
index 17b90623db..0000000000
--- a/src/engine/engineValve/valveBank.H
+++ /dev/null
@@ -1,107 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::valveBank
-
-Description
-    A list of valves.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef valveBank_H
-#define valveBank_H
-
-#include "PtrList.H"
-#include "engineValve.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class valveBank Declaration
-\*---------------------------------------------------------------------------*/
-
-class valveBank
-:
-    public PtrList<engineValve>
-{
-    // Private Member Functions
-
-        //- No copy construct
-        valveBank(const valveBank&) = delete;
-
-        //- No copy assignment
-        void operator=(const valveBank&) = delete;
-
-
-public:
-
-    // Constructors
-
-        //- Construct from Istream
-        valveBank
-        (
-            const polyMesh& mesh,
-            Istream& is
-        )
-        {
-            PtrList<entry> valveEntries(is);
-
-            setSize(valveEntries.size());
-
-            forAll(valveEntries, valveI)
-            {
-                valveI,
-                set
-                (
-                    new engineValve
-                    (
-                        valveEntries[valveI].keyword(),
-                        mesh,
-                        valveEntries[valveI].dict()
-                    )
-                );
-            }
-        }
-
-
-    //- Destructor
-    ~valveBank() = default;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 283fa43a38..049ca8d0e7 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -758,7 +758,10 @@ void Foam::fvMesh::mapFields(const mapPolyMesh& meshMap)
     (mapper);
     MapGeometricFields<vector, fvsPatchField, fvMeshMapper, surfaceMesh>
     (mapper);
-    MapGeometricFields<symmTensor, fvsPatchField, fvMeshMapper, surfaceMesh>
+    MapGeometricFields
+    <
+        sphericalTensor, fvsPatchField, fvMeshMapper, surfaceMesh
+    >
     (mapper);
     MapGeometricFields<symmTensor, fvsPatchField, fvMeshMapper, surfaceMesh>
     (mapper);
diff --git a/src/functionObjects/field/comfort/comfort.C b/src/functionObjects/field/comfort/comfort.C
index 2878d0be0b..2952500de8 100644
--- a/src/functionObjects/field/comfort/comfort.C
+++ b/src/functionObjects/field/comfort/comfort.C
@@ -99,7 +99,7 @@ Foam::dimensionedScalar Foam::functionObjects::comfort::Trad() const
             << "The calculated mean wall radiation temperature is out of the\n"
             << "bounds specified in EN ISO 7730:2005\n"
             << "Valid range is 10 degC < T < 40 degC\n"
-            << "The actual value is: " << Trad - 273.15 << nl << endl;
+            << "The actual value is: " << (Trad.value() - 273.15) << nl << endl;
     }
 
     return Trad;
diff --git a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
index 3f1d548a4b..85fc7cc7c8 100644
--- a/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
+++ b/src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
@@ -279,9 +279,9 @@ bool Foam::functionObjects::fieldValues::volFieldValue::read
         {
             Info<< flatOutput(weightFieldNames_) << nl;
         }
-    }
 
-    Info<< nl << endl;
+        Info<< nl << endl;
+    }
 
     return true;
 }