diff --git a/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C b/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
index ea17c1a878..315b14d1d0 100644
--- a/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
+++ b/applications/test/mapDistributePolyMesh/Test-mapDistributePolyMesh.C
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
         (
             "procAddressing",
             instance,
-            fvMesh::meshSubDir,
+            polyMesh::meshSubDir,
             mesh,
             IOobject::MUST_READ,
             IOobject::NO_WRITE,
diff --git a/applications/test/volField/Test-volField.C b/applications/test/volField/Test-volField.C
index 8979532bbd..813a8b58e1 100644
--- a/applications/test/volField/Test-volField.C
+++ b/applications/test/volField/Test-volField.C
@@ -118,7 +118,8 @@ PtrList<GeoField> create
             (
                 word("cmpt." + name(i)),
                 mesh,
-                dimensioned<typename GeoField::value_type>(Zero)
+                Foam::zero{},  // value
+                dimless
             ).ptr()
         );
     }
diff --git a/applications/utilities/preProcessing/setExprFields/setExprFields.C b/applications/utilities/preProcessing/setExprFields/setExprFields.C
index 59c180c551..2904f42d8e 100644
--- a/applications/utilities/preProcessing/setExprFields/setExprFields.C
+++ b/applications/utilities/preProcessing/setExprFields/setExprFields.C
@@ -148,7 +148,8 @@ bool setField
         (
             fieldName,
             mesh,
-            dimensioned<typename GeoField::value_type>(dims)
+            Foam::zero{},  // value
+            dims
         );
     }
     else
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index 3c395b5ae0..8cf8c12438 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2020-2021,2023 OpenCFD Ltd.
+    Copyright (C) 2020-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,22 +68,15 @@ CrankNicolsonDdtScheme<Type>::DDt0Field<GeoField>::DDt0Field
 (
     const IOobject& io,
     const fvMesh& mesh,
-    const dimensioned<typename GeoField::value_type>& dimType
+    const typename GeoField::value_type& value,
+    const dimensionSet& dims
 )
 :
-    GeoField(io, mesh, dimType),
+    GeoField(io, mesh, value, dims),
     startTimeIndex_(mesh.time().timeIndex())
 {}
 
 
-template<class Type>
-template<class GeoField>
-label CrankNicolsonDdtScheme<Type>::DDt0Field<GeoField>::startTimeIndex() const
-{
-    return startTimeIndex_;
-}
-
-
 template<class Type>
 template<class GeoField>
 GeoField& CrankNicolsonDdtScheme<Type>::DDt0Field<GeoField>::operator()()
@@ -127,7 +120,7 @@ CrankNicolsonDdtScheme<Type>::ddt0_
             (
                 name,
                 startTimeName,
-                mesh()
+                mesh().thisDb()
             ).template typeHeaderOk<DDt0Field<GeoField>>(true)
         )
         {
@@ -139,9 +132,10 @@ CrankNicolsonDdtScheme<Type>::ddt0_
                     (
                         name,
                         startTimeName,
-                        mesh(),
+                        mesh().thisDb(),
                         IOobject::MUST_READ,
-                        IOobject::AUTO_WRITE
+                        IOobject::AUTO_WRITE,
+                        IOobject::REGISTER
                     ),
                     mesh()
                 )
@@ -159,25 +153,21 @@ CrankNicolsonDdtScheme<Type>::ddt0_
                         mesh().time().timeName(),
                         mesh().thisDb(),
                         IOobject::NO_READ,
-                        IOobject::AUTO_WRITE
+                        IOobject::AUTO_WRITE,
+                        IOobject::REGISTER
                     ),
                     mesh(),
-                    dimensioned<typename GeoField::value_type>
-                    (
-                        dims/dimTime,
-                        Zero
-                    )
+                    Foam::zero{},  // value
+                    dims/dimTime
                 )
             );
         }
     }
 
-    DDt0Field<GeoField>& ddt0 = static_cast<DDt0Field<GeoField>&>
+    return static_cast<DDt0Field<GeoField>&>
     (
         mesh().objectRegistry::template lookupObjectRef<GeoField>(name)
     );
-
-    return ddt0;
 }
 
 
@@ -369,7 +359,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
         (
             ddtIOobject,
             mesh(),
-            dimensioned<Type>(dt.dimensions()/dimTime, Zero)
+            Foam::zero{},  // value
+            (dt.dimensions()/dimTime)
         )
     );
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
index 55ac242e56..6f6f79550c 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
@@ -53,10 +53,10 @@ Description
         default         CrankNicolson
         ocCoeff
         {
-            type scale;
-            scale linearRamp;
-            duration 0.01;
-            value 0.9;
+            type        scale;
+            scale       linearRamp;
+            duration    0.01;
+            value       0.9;
         };
     }
     \endverbatim
@@ -93,8 +93,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef CrankNicolsonDdtScheme_H
-#define CrankNicolsonDdtScheme_H
+#ifndef Foam_CrankNicolsonDdtScheme_H
+#define Foam_CrankNicolsonDdtScheme_H
 
 #include "ddtScheme.H"
 #include "Function1.H"
@@ -120,9 +120,9 @@ class CrankNicolsonDdtScheme
 {
     // Private Data
 
-        //- Class to store the ddt0 fields on the objectRegistry for use in the
-        //  next time-step.  The start-time index of the CN scheme is also
-        //  stored to help handle the transition from Euler to CN
+        //- Store ddt0 fields on the registry for use in the next time-step.
+        //  The start-time index of the CN scheme is also stored
+        //  to help handle the transition from Euler to CrankNicolson
         template<class GeoField>
         class DDt0Field
         :
@@ -132,24 +132,24 @@ class CrankNicolsonDdtScheme
 
         public:
 
-            //- Constructor from file for restart.
+            //- Read construct from file (for restart)
             DDt0Field
             (
                 const IOobject& io,
                 const fvMesh& mesh
             );
 
-            //- Constructor from components, initisalised to zero with given
-            //  dimensions.
+            //- Construct value-initialised with given dimensions
             DDt0Field
             (
                 const IOobject& io,
                 const fvMesh& mesh,
-                const dimensioned<typename GeoField::value_type>& dimType
+                const typename GeoField::value_type& value,
+                const dimensionSet& dims
             );
 
             //- Return the start-time index
-            label startTimeIndex() const;
+            label startTimeIndex() const noexcept { return startTimeIndex_; }
 
             //- Cast to the underlying GeoField
             GeoField& operator()();
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
index 849852f754..0712b59fd0 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
@@ -254,10 +254,8 @@ steadyStateDdtScheme<Type>::fvcDdtUfCorr
                 mesh().thisDb()
             ),
             mesh(),
-            dimensioned<typename flux<Type>::type>
-            (
-                Uf.dimensions()*dimArea/dimTime, Zero
-            )
+            Foam::zero{},  // value
+            Uf.dimensions()*dimArea/dimTime
         )
     );
 
@@ -286,10 +284,8 @@ steadyStateDdtScheme<Type>::fvcDdtPhiCorr
                 mesh().thisDb()
             ),
             mesh(),
-            dimensioned<typename flux<Type>::type>
-            (
-                phi.dimensions()/dimTime, Zero
-            )
+            Foam::zero{},  // value
+            phi.dimensions()/dimTime
         )
     );
 
@@ -321,10 +317,8 @@ steadyStateDdtScheme<Type>::fvcDdtUfCorr
                 mesh().thisDb()
             ),
             mesh(),
-            dimensioned<typename flux<Type>::type>
-            (
-                Uf.dimensions()*dimArea/dimTime, Zero
-            )
+            Foam::zero{},  // value
+            Uf.dimensions()*dimArea/dimTime
         )
     );
 
@@ -356,10 +350,8 @@ steadyStateDdtScheme<Type>::fvcDdtPhiCorr
                 mesh().thisDb()
             ),
             mesh(),
-            dimensioned<typename flux<Type>::type>
-            (
-                phi.dimensions()/dimTime, Zero
-            )
+            Foam::zero{},  // value
+            phi.dimensions()/dimTime
         )
     );
 
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
index 915b62d003..dece6229b7 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/advectionDiffusion/advectionDiffusionPatchDistMethod.C
@@ -79,8 +79,7 @@ Foam::patchDistMethods::advectionDiffusion::advectionDiffusion
     tolerance_(coeffs_.getOrDefault<scalar>("tolerance", 1e-3)),
     maxIter_(coeffs_.getOrDefault<int>("maxIter", 10)),
     predicted_(false),
-    checkAndWriteMesh_
-        (coeffs_.lookupOrDefault<bool>("checkAndWriteMesh", true))
+    checkAndWriteMesh_(coeffs_.getOrDefault("checkAndWriteMesh", true))
 {}
 
 
@@ -119,11 +118,11 @@ bool Foam::patchDistMethods::advectionDiffusion::correct
                 (
                    "points",
                     mesh_.pointsInstance(),
-                    mesh_.meshSubDir,
+                    polyMesh::meshSubDir,
                     mesh_,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE,
-                    false
+                    IOobject::NO_REGISTER
                 ),
                 mesh_.points()
             );
diff --git a/src/functionObjects/field/age/age.C b/src/functionObjects/field/age/age.C
index 72cf677d2f..d63e452b9c 100644
--- a/src/functionObjects/field/age/age.C
+++ b/src/functionObjects/field/age/age.C
@@ -90,31 +90,6 @@ bool Foam::functionObjects::age::converged
 }
 
 
-template<class GeoField>
-Foam::autoPtr<GeoField>
-Foam::functionObjects::age::newField
-(
-    const word& baseName,
-    const wordList patches
-) const
-{
-    return autoPtr<GeoField>::New
-    (
-        IOobject
-        (
-            scopedName(baseName),
-            time_.timeName(),
-            mesh_,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        mesh_,
-        dimensioned<typename GeoField::value_type>(dimTime, Zero),
-        patches
-    );
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::functionObjects::age::age
diff --git a/src/functionObjects/field/age/age.H b/src/functionObjects/field/age/age.H
index 1abb2ae777..daba0c401d 100644
--- a/src/functionObjects/field/age/age.H
+++ b/src/functionObjects/field/age/age.H
@@ -141,14 +141,6 @@ class age
         //- Return true if convergence is reached
         bool converged(const int nCorr, const scalar initialResidual) const;
 
-        //- Create and allocate a new zero geometric field
-        template<class GeoField>
-        autoPtr<GeoField> newField
-        (
-            const word& baseName,
-            const wordList
-        ) const;
-
 
 public:
 
diff --git a/src/functionObjects/field/binField/binModels/binModel/binModelNew.C b/src/functionObjects/field/binField/binModels/binModel/binModelNew.C
index 9d09a4ebf8..6839389730 100644
--- a/src/functionObjects/field/binField/binModels/binModel/binModelNew.C
+++ b/src/functionObjects/field/binField/binModels/binModel/binModelNew.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021-2022 OpenCFD Ltd.
+    Copyright (C) 2021-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,11 +37,11 @@ Foam::autoPtr<Foam::binModel> Foam::binModel::New
     const word& outputPrefix
 )
 {
-    word modelType(dict.get<word>("binModel"));
+    const word modelType(dict.get<word>("binModel"));
 
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+    auto* ctorPtr = dictionaryConstructorTable(modelType);
 
-    if (!cstrIter.good())
+    if (!ctorPtr)
     {
         FatalIOErrorInLookup
         (
@@ -52,7 +52,7 @@ Foam::autoPtr<Foam::binModel> Foam::binModel::New
         ) << exit(FatalIOError);
     }
 
-    return autoPtr<binModel>(cstrIter()(dict, mesh, outputPrefix));
+    return autoPtr<binModel>(ctorPtr(dict, mesh, outputPrefix));
 }
 
 
diff --git a/src/functionObjects/field/momentum/momentum.C b/src/functionObjects/field/momentum/momentum.C
index 0162732793..04a3f131ae 100644
--- a/src/functionObjects/field/momentum/momentum.C
+++ b/src/functionObjects/field/momentum/momentum.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2024 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -71,13 +71,14 @@ Foam::functionObjects::momentum::newField
             (
                 scopedName(baseName),
                 time_.timeName(),
-                mesh_,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE,
+                mesh_.thisDb(),
+                IOobjectOption::NO_READ,
+                IOobjectOption::NO_WRITE,
                 registerObject
             ),
             mesh_,
-            dimensioned<typename GeoField::value_type>(dims, Zero)
+            Foam::zero{},  // value
+            dims
         );
 }
 
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
index 88b9ad42da..8dad26141a 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C
@@ -1714,7 +1714,7 @@ Foam::meshRefinement::meshRefinement
         (
             "surfaceIndex",
             mesh_.facesInstance(),
-            fvMesh::meshSubDir,
+            polyMesh::meshSubDir,
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C
index faacd652ec..0400a813eb 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C
@@ -724,7 +724,7 @@ void Foam::cyclicACMIGAMGInterface::write(Ostream& os) const
 {
     GAMGInterface::write(os);
 
-    const bool hasAMI = amiPtr_.valid();
+    const bool hasAMI = bool(amiPtr_);
 
     os  << token::SPACE << neighbPatchID_
         << token::SPACE << owner_
diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
index bcb6146bfd..69dd64b638 100644
--- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
+++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C
@@ -964,7 +964,7 @@ void Foam::cyclicAMIGAMGInterface::write(Ostream& os) const
 {
     GAMGInterface::write(os);
 
-    const bool hasAMI = amiPtr_.valid();
+    const bool hasAMI = bool(amiPtr_);
 
     os  << token::SPACE << neighbPatchID_
         << token::SPACE << owner_
diff --git a/src/meshTools/coordSet/writers/common/coordSetWriterTemplates.C b/src/meshTools/coordSet/writers/common/coordSetWriterTemplates.C
index 28e8f08de5..d1ea1d8564 100644
--- a/src/meshTools/coordSet/writers/common/coordSetWriterTemplates.C
+++ b/src/meshTools/coordSet/writers/common/coordSetWriterTemplates.C
@@ -105,8 +105,8 @@ Foam::tmp<Foam::Field<Type>> Foam::coordSetWriter::adjustFieldTemplate
         // Rotate fields (vector and non-spherical tensors)
         if
         (
-            (pTraits<Type>::rank != 0 && pTraits<Type>::nComponents > 1)
-         && geometryTransform_.valid()
+            (is_vectorspace<Type>::value && pTraits<Type>::nComponents > 1)
+         && geometryTransform_.good()
          && !geometryTransform_.R().is_identity()
         )
         {
diff --git a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/processorColour.C b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/processorColour.C
index b852dd5c10..92298e2091 100644
--- a/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/processorColour.C
+++ b/src/meshTools/matrices/lduMatrix/preconditioners/distributedDILUPreconditioner/processorColour.C
@@ -149,12 +149,12 @@ Foam::label Foam::processorColour::colour
     //            mesh.time().timeName(),
     //            mesh,
     //            IOobject::NO_READ,
-    //            IOobject::AUTO_WRITE,
-    //            false
+    //            IOobject::NO_WRITE,
+    //            IOobject::NO_REGISTER
     //        ),
     //        mesh,
     //        dimensionedScalar(dimless, procColour[Pstream::myProcNo()]),
-    //        zeroGradientFvPatchScalarField::typeName
+    //        fvPatchFieldBase::zeroGradientType()
     //    );
     //    volColour.write();
     //}
diff --git a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodpLaplacianMotionSolver/displacementMethodpLaplacianMotionSolver.C b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodpLaplacianMotionSolver/displacementMethodpLaplacianMotionSolver.C
index d73d0d270b..7e33bac17d 100644
--- a/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodpLaplacianMotionSolver/displacementMethodpLaplacianMotionSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/displacementMethod/displacementMethodpLaplacianMotionSolver/displacementMethodpLaplacianMotionSolver.C
@@ -65,9 +65,9 @@ displacementMethodpLaplacianMotionSolver
                 "dynamicMeshDict",
                 mesh.time().constant(),
                 mesh,
-                IOobject::MUST_READ_IF_MODIFIED,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             )
         ).subDict("pLaplacianMotionSolverCoeffs").getOrDefault<bool>
         (
diff --git a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.C b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.C
index 3778a5cce9..5b562382f7 100644
--- a/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/dynamicMesh/motionSolver/elasticityMotionSolver/elasticityMotionSolver.C
@@ -264,10 +264,11 @@ void Foam::elasticityMotionSolver::solve()
                 (
                     "points",
                     mesh().pointsInstance(),
-                    mesh().meshSubDir,
+                    polyMesh::meshSubDir,
                     mesh(),
                     IOobject::NO_READ,
-                    IOobject::NO_WRITE
+                    IOobject::NO_WRITE,
+                    IOobject::NO_REGISTER
                 ),
                 mesh().points()
             );
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager.C b/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager.C
index 39b3688431..937bcb4587 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager.C
@@ -254,19 +254,21 @@ bool objectiveManager::writeObjectives
     const bool valid
 )
 {
-    if (weightedObjectiveFile_.valid())
+    if (weightedObjectiveFile_)
     {
+        auto& os = weightedObjectiveFile_();
+
         unsigned int width = IOstream::defaultPrecision() + 5;
-        weightedObjectiveFile_()
+
+        os
             << setw(4) << mesh_.time().timeName() << " "
             << setw(width) << weightedObjective << " ";
 
         for (objective& objI : objectives_)
         {
-            weightedObjectiveFile_()
-                << setw(width) << objI.JCycle() << " ";
+            os  << setw(width) << objI.JCycle() << " ";
         }
-        weightedObjectiveFile_() << endl;
+        os  << endl;
     }
 
     return writeObjectives();
diff --git a/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C b/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C
index eca940fdf7..6045ec353b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C
+++ b/src/optimisation/adjointOptimisation/adjoint/objectives/objective/objective.C
@@ -275,7 +275,7 @@ scalar objective::JCycle(bool negate) const
     }
 
     // Subtract target, in case the objective is used as a constraint
-    if (target_.valid())
+    if (target_)
     {
         if (negate)
         {
@@ -541,12 +541,12 @@ bool objective::write(const bool valid) const
             ios_base::fmtflags flags = file.flags();
             flags |= std::cout.left;
             file.flags(flags);
-            if (target_.valid())
+            if (target_)
             {
                 file<< setw(width_) << "#target" << " "
                     << setw(width_) << target_() << endl;
             }
-            if (targetLeft_.valid())
+            if (targetLeft_)
             {
                 file<< setw(width_) << "#targetLeft" << " "
                     << setw(width_) << targetLeft_() << endl;
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/adjointSensitivity/adjointEikonalSolver/adjointEikonalSolver.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/adjointSensitivity/adjointEikonalSolver/adjointEikonalSolver.C
index 782f4c1e78..64735b5080 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/adjointSensitivity/adjointEikonalSolver/adjointEikonalSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/adjointSensitivity/adjointEikonalSolver/adjointEikonalSolver.C
@@ -48,6 +48,7 @@ namespace Foam
 
 defineTypeNameAndDebug(adjointEikonalSolver, 0);
 
+
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 wordList adjointEikonalSolver::patchTypes() const
@@ -60,7 +61,7 @@ wordList adjointEikonalSolver::patchTypes() const
 
     for (const label patchi : wallPatchIDs_)
     {
-        daTypes[patchi] = zeroGradientFvPatchScalarField::typeName;
+        daTypes[patchi] = fvPatchFieldBase::zeroGradientType();
     }
 
     return daTypes;
@@ -212,7 +213,7 @@ void adjointEikonalSolver::solve()
             mesh_,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
-            false
+            IOobject::NO_REGISTER
         ),
         mesh_,
         dimensionedScalar("scaleDims", dimTime/dimLength, scalar(1))
@@ -329,7 +330,7 @@ tmp<volTensorField> adjointEikonalSolver::getFISensitivityTerm() const
             ),
             mesh_,
             dimensionedTensor(da_.dimensions(), Zero),
-            zeroGradientFvPatchField<tensor>::typeName
+            fvPatchFieldBase::zeroGradientType()
         )
     );
     volTensorField& distanceSens = tdistanceSens.ref();
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/designVariables/designVariables.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/designVariables/designVariables.C
index 459b4ed2d6..bd0b171d58 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/designVariables/designVariables.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/designVariables/designVariables.C
@@ -66,9 +66,9 @@ void Foam::designVariables::readBounds
         scalar lowerBound(dict_.get<scalar>("lowerBound"));
         lowerBounds_.reset(new scalarField(getVars().size(), lowerBound));
     }
-    else if (lowerBoundPtr.valid())
+    else if (lowerBoundPtr)
     {
-        lowerBounds_.reset(new scalarField(getVars().size(), lowerBoundPtr()));
+        lowerBounds_.reset(new scalarField(getVars().size(), *lowerBoundPtr));
     }
 
     // Read upper bounds for the design variables, if present
@@ -91,9 +91,9 @@ void Foam::designVariables::readBounds
         scalar upperBound(dict_.get<scalar>("upperBound"));
         upperBounds_.reset(new scalarField(getVars().size(), upperBound));
     }
-    else if (upperBoundPtr.valid())
+    else if (upperBoundPtr)
     {
-        upperBounds_.reset(new scalarField(getVars().size(), upperBoundPtr()));
+        upperBounds_.reset(new scalarField(getVars().size(), *upperBoundPtr));
     }
 }
 
@@ -164,9 +164,9 @@ Foam::autoPtr<Foam::designVariables> Foam::designVariables::New
 
     Info<< "designVariables type : " << modelType << endl;
 
-    auto cstrIter = designVariablesConstructorTablePtr_->cfind(modelType);
+    auto* ctorPtr = designVariablesConstructorTable(modelType);
 
-    if (!cstrIter.found())
+    if (!ctorPtr)
     {
         FatalErrorInLookup
         (
@@ -176,7 +176,7 @@ Foam::autoPtr<Foam::designVariables> Foam::designVariables::New
         ) << exit(FatalError);
     }
 
-    return autoPtr<designVariables>(cstrIter()(mesh, dict));
+    return autoPtr<designVariables>(ctorPtr(mesh, dict));
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/designVariables/designVariablesI.H b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/designVariables/designVariablesI.H
index 28c7f05bbe..025cf5dc57 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/designVariables/designVariablesI.H
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/designVariables/designVariablesI.H
@@ -37,7 +37,7 @@ Foam::designVariables::activeDesignVariables() const
 
 bool Foam::designVariables::isMaxInitChangeSet() const
 {
-    return maxInitChange_.valid();
+    return bool(maxInitChange_);
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/levelSet/levelSetDesignVariables.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/levelSet/levelSetDesignVariables.C
index e28b90547c..3d9d41c561 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/levelSet/levelSetDesignVariables.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/levelSet/levelSetDesignVariables.C
@@ -227,11 +227,7 @@ void Foam::levelSetDesignVariables::updateSignedDistances()
         ),
         mesh_,
         dimensionedScalar(dimLength, Zero),
-        wordList
-        (
-            mesh_.boundary().size(),
-            zeroGradientFvPatchField<scalar>::typeName
-        )
+        fvPatchFieldBase::zeroGradientType()
     );
     y.primitiveFieldRef() = aTilda_.primitiveFieldRef();
     y.correctBoundaryConditions();
@@ -297,7 +293,7 @@ levelSetDesignVariables::levelSetDesignVariables
         ),
         mesh_,
         dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchField<scalar>::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     signedDistances_
     (
@@ -311,7 +307,7 @@ levelSetDesignVariables::levelSetDesignVariables
         ),
         mesh_,
         dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchField<scalar>::typeName
+        fvPatchFieldBase::zeroGradientType()
     ),
     interpolation_
     (
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/Bezier/BezierDesignVariables.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/Bezier/BezierDesignVariables.C
index 05e11c7614..af96e7c30e 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/Bezier/BezierDesignVariables.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/Bezier/BezierDesignVariables.C
@@ -159,7 +159,7 @@ Foam::BezierDesignVariables::BezierDesignVariables
                 mesh,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         )
     ),
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/shapeDesignVariables/shapeDesignVariables.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/shapeDesignVariables/shapeDesignVariables.C
index c1eca2034b..388b1dc77b 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/shapeDesignVariables/shapeDesignVariables.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/shapeDesignVariables/shapeDesignVariables.C
@@ -211,9 +211,9 @@ Foam::autoPtr<Foam::shapeDesignVariables> Foam::shapeDesignVariables::New
 
     Info<< "shapeDesignVariables type : " << modelType << endl;
 
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+    auto* ctorPtr = dictionaryConstructorTable(modelType);
 
-    if (!cstrIter.found())
+    if (!ctorPtr)
     {
         FatalErrorInLookup
         (
@@ -223,7 +223,7 @@ Foam::autoPtr<Foam::shapeDesignVariables> Foam::shapeDesignVariables::New
         ) << exit(FatalError);
     }
 
-    return autoPtr<shapeDesignVariables>(cstrIter()(mesh, dict));
+    return autoPtr<shapeDesignVariables>(ctorPtr(mesh, dict));
 }
 
 
@@ -281,11 +281,11 @@ void Foam::shapeDesignVariables::moveMesh()
             (
                "points",
                 mesh_.pointsInstance(),
-                mesh_.meshSubDir,
+                polyMesh::meshSubDir,
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             mesh_.points()
         );
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/volumetricBSplines/morphingBoxConstraints/morphingBoxConstaint/morphingBoxConstraint.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/volumetricBSplines/morphingBoxConstraints/morphingBoxConstaint/morphingBoxConstraint.C
index 377230d242..334c05f5b6 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/volumetricBSplines/morphingBoxConstraints/morphingBoxConstaint/morphingBoxConstraint.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/volumetricBSplines/morphingBoxConstraints/morphingBoxConstaint/morphingBoxConstraint.C
@@ -121,9 +121,9 @@ Foam::autoPtr<Foam::morphingBoxConstraint> Foam::morphingBoxConstraint::New
 
     Info<< "morphingBoxConstraint type : " << modelType << endl;
 
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+    auto* ctorPtr = dictionaryConstructorTable(modelType);
 
-    if (!cstrIter.found())
+    if (!ctorPtr)
     {
         FatalErrorInLookup
         (
@@ -135,10 +135,11 @@ Foam::autoPtr<Foam::morphingBoxConstraint> Foam::morphingBoxConstraint::New
 
     return autoPtr<morphingBoxConstraint>
     (
-        cstrIter()(mesh, dict, designVariables)
+        ctorPtr(mesh, dict, designVariables)
     );
 }
 
+
 // * * * * * * * * * * * * * * *  Member Functions   * * * * * * * * * * * * //
 
 void Foam::morphingBoxConstraint::computeBounds
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/volumetricBSplines/volumetricBSplinesDesignVariables.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/volumetricBSplines/volumetricBSplinesDesignVariables.C
index d20d3e08b7..3c22b4327d 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/volumetricBSplines/volumetricBSplinesDesignVariables.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/shape/volumetricBSplines/volumetricBSplinesDesignVariables.C
@@ -307,7 +307,7 @@ void Foam::volumetricBSplinesDesignVariables::setDisplacement
                 mesh_,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             ),
             pointMesh::New(mesh_),
             dimensionedVector(dimless, Zero)
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/betaMax/Darcy/betaMaxDarcy.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/betaMax/Darcy/betaMaxDarcy.C
index 69c9c47001..787a92789c 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/betaMax/Darcy/betaMaxDarcy.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/betaMax/Darcy/betaMaxDarcy.C
@@ -58,12 +58,12 @@ Foam::betaMaxDarcy::betaMaxDarcy
         (
             IOobject
             (
-                 "transportProperties",
-                 mesh.time().constant(),
-                 mesh,
-                 IOobject::MUST_READ,
-                 IOobject::NO_WRITE,
-                 false
+                "transportProperties",
+                mesh.time().constant(),
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             )
         ).get<dimensionedScalar>("nu").value();
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/betaMax/betaMax/betaMax.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/betaMax/betaMax/betaMax.C
index 3490e91407..99a1c78eb3 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/betaMax/betaMax/betaMax.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/betaMax/betaMax/betaMax.C
@@ -173,7 +173,7 @@ Foam::boolList Foam::betaMax::markProcessorEdges
         const edge meshE = edge(mp[e[0]], mp[e[1]]);
         auto iter = isInletEdge.find(meshE);
 
-        if (iter.found())
+        if (iter.good())
         {
             iter.val() = true;
         }
@@ -196,9 +196,8 @@ Foam::boolList Foam::betaMax::markProcessorEdges
     {
         const edge& e = edges[edgeI];
         const edge meshE = edge(mp[e[0]], mp[e[1]]);
-        const auto iter = isInletEdge.cfind(meshE);
 
-        if (iter.found() && iter.val())
+        if (isInletEdge.lookup(meshE, false))
         {
             isProcessorEdge[edgeI - nInternalEdges] = true;
         }
@@ -208,7 +207,6 @@ Foam::boolList Foam::betaMax::markProcessorEdges
 }
 
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::betaMax::betaMax
@@ -232,11 +230,11 @@ Foam::autoPtr<Foam::betaMax> Foam::betaMax::New
 {
     const word modelType(dict.getOrDefault<word>("betaMaxType", "value"));
 
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+    auto* ctorPtr = dictionaryConstructorTable(modelType);
 
     Info<< "betaMax type " << modelType << endl;
 
-    if (!cstrIter.found())
+    if (!ctorPtr)
     {
         FatalIOErrorInLookup
         (
@@ -247,7 +245,7 @@ Foam::autoPtr<Foam::betaMax> Foam::betaMax::New
         ) << exit(FatalIOError);
     }
 
-    return autoPtr<betaMax>(cstrIter()(mesh, dict));
+    return autoPtr<betaMax>(ctorPtr(mesh, dict));
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/interpolationFunctions/interpolationFunction/topOInterpolationFunction.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/interpolationFunctions/interpolationFunction/topOInterpolationFunction.C
index c71e55afe4..918f2c0154 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/interpolationFunctions/interpolationFunction/topOInterpolationFunction.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/interpolationFunctions/interpolationFunction/topOInterpolationFunction.C
@@ -64,9 +64,9 @@ Foam::topOInterpolationFunction::New
 
     Info<< "topOInterpolationFunction type : " << type << endl;
 
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(type);
+    auto* ctorPtr = dictionaryConstructorTable(type);
 
-    if (!cstrIter.found())
+    if (!ctorPtr)
     {
         FatalIOErrorInLookup
         (
@@ -77,7 +77,7 @@ Foam::topOInterpolationFunction::New
         ) << exit(FatalIOError);
     }
 
-    return autoPtr<topOInterpolationFunction>(cstrIter()(mesh, dict));
+    return autoPtr<topOInterpolationFunction>(ctorPtr(mesh, dict));
 }
 
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/regularisation/fieldRegularisation.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/regularisation/fieldRegularisation.C
index 4887f48ce1..29ff486a6a 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/regularisation/fieldRegularisation.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/regularisation/fieldRegularisation.C
@@ -28,7 +28,6 @@ License
 
 #include "fieldRegularisation.H"
 #include "fixedValueFvPatchFields.H"
-#include "zeroGradientFvPatchFields.H"
 #include "wallFvPatch.H"
 #include "fvm.H"
 
@@ -96,7 +95,7 @@ Foam::fieldRegularisation::fieldRegularisation
         ),
         mesh_,
         dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
     )
 {
     DebugInfo
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/regularisation/regularisationPDE/regularisationPDE/regularisationPDE.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/regularisation/regularisationPDE/regularisationPDE/regularisationPDE.C
index ee6870d36a..78e6c5394d 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/regularisation/regularisationPDE/regularisationPDE/regularisationPDE.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/regularisation/regularisationPDE/regularisationPDE/regularisationPDE.C
@@ -138,11 +138,11 @@ Foam::autoPtr<Foam::regularisationPDE> Foam::regularisationPDE::New
     const word modelType =
         dict.getOrDefault<word>("regularisationPDE", "Helmholtz");
 
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+    auto* ctorPtr = dictionaryConstructorTable(modelType);
 
     Info<< "regularisationPDE type " << modelType << endl;
 
-    if (!cstrIter.found())
+    if (!ctorPtr)
     {
         FatalIOErrorInLookup
         (
@@ -155,7 +155,7 @@ Foam::autoPtr<Foam::regularisationPDE> Foam::regularisationPDE::New
 
     return autoPtr<regularisationPDE>
     (
-        cstrIter()(mesh, dict, zones)
+        ctorPtr(mesh, dict, zones)
     );
 }
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/regularisation/regularisationRadius/regularisationRadius/regularisationRadius.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/regularisation/regularisationRadius/regularisationRadius/regularisationRadius.C
index 2d50c741e2..04667a8b14 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/regularisation/regularisationRadius/regularisationRadius/regularisationRadius.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/regularisation/regularisationRadius/regularisationRadius/regularisationRadius.C
@@ -62,11 +62,11 @@ Foam::autoPtr<Foam::regularisationRadius> Foam::regularisationRadius::New
 {
     const word modelType = dict.getOrDefault<word>("type", "isotropic");
 
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+    auto* ctorPtr = dictionaryConstructorTable(modelType);
 
     Info<< "regularisationRadius type " << modelType << endl;
 
-    if (!cstrIter.found())
+    if (!ctorPtr)
     {
         FatalIOErrorInLookup
         (
@@ -79,7 +79,7 @@ Foam::autoPtr<Foam::regularisationRadius> Foam::regularisationRadius::New
 
     return autoPtr<regularisationRadius>
     (
-        cstrIter()(mesh, dict, adjustWallThickness)
+        ctorPtr(mesh, dict, adjustWallThickness)
     );
 }
 
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/designVariablesUpdate/designVariablesUpdate.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/designVariablesUpdate/designVariablesUpdate.C
index 0e41d4e59f..690b2dde15 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/designVariablesUpdate/designVariablesUpdate.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationManager/optimisationManager/designVariablesUpdate/designVariablesUpdate.C
@@ -372,7 +372,7 @@ void Foam::designVariablesUpdate::update(const scalarField& direction)
 {
     // Multiply with line search step, if necessary
     scalarField correction(direction);
-    if (lineSearch_.valid())
+    if (lineSearch_)
     {
         lineSearch_->updateCorrection(correction);
     }
@@ -551,9 +551,10 @@ void Foam::designVariablesUpdate::postUpdate(const scalarField& oldCorrection)
     updateOldCorrection(oldCorrection);
     write();
     designVars_->evolveNumber();
-    if (lineSearch_.valid())
+    if (lineSearch_)
     {
-        lineSearch_().postUpdate();
+        lineSearch_->postUpdate();
+
         // Append additional empty line at the end of the instantaneous
         // objective file to indicate the end of the block corresponding to
         // this optimisation cycle
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/adjointSolver/adjointSolver.C b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/adjointSolver/adjointSolver.C
index 9510d1977d..90259b2e15 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/adjointSolver/adjointSolver.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/adjointSolvers/adjointSolver/adjointSolver.C
@@ -67,7 +67,7 @@ Foam::dictionary Foam::adjointSolver::designVarsDict() const
                 mesh_,
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,
-                false
+                IOobject::NO_REGISTER
             )
         ).subDict("optimisation").subDict("designVariables");
 }
@@ -270,7 +270,7 @@ void Foam::adjointSolver::updatePrimalBasedQuantities()
 
 bool Foam::adjointSolver::writeData(Ostream& os) const
 {
-    if (sensitivities_.valid())
+    if (sensitivities_.good())
     {
         sensitivities_().writeEntry("sensitivities", os);
     }
diff --git a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSetTemplates.C b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSetTemplates.C
index 92bc073275..d52815787e 100644
--- a/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSetTemplates.C
+++ b/src/optimisation/adjointOptimisation/adjoint/solvers/variablesSet/variablesSet/variablesSetTemplates.C
@@ -170,7 +170,7 @@ variablesSet::allocateRenamedField
 {
     typedef GeometricField<Type, PatchField, GeoMesh> fieldType;
     autoPtr<fieldType> returnField(nullptr);
-    if (bf.valid())
+    if (bf)
     {
         const word timeName = bf().mesh().time().timeName();
         returnField.reset
diff --git a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.H b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.H
index 5cf3d8cb52..06482f8889 100644
--- a/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.H
+++ b/src/optimisation/adjointOptimisation/adjoint/turbulenceModels/incompressibleAdjoint/adjointRAS/derivedFvPatchFields/adjointInletNuaTilda/adjointInletNuaTildaFvPatchScalarField.H
@@ -114,7 +114,6 @@ public:
             const DimensionedField<scalar, volMesh>& iF
         ) const
         {
-            Info<< "manager name " << managerName_ << endl;
             return tmp<fvPatchScalarField>
             (
                 new adjointInletNuaTildaFvPatchScalarField(*this, iF)
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C
index ecffddb653..3bc950ab26 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C
@@ -50,9 +50,9 @@ Foam::wallBoilingModels::nucleateFluxModel::New
 
     Info<< "Selecting nucleateFluxModel: " << modelType << endl;
 
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+    auto* ctorPtr = dictionaryConstructorTable(modelType);
 
-    if (!cstrIter.good())
+    if (!ctorPtr)
     {
         FatalIOErrorInLookup
         (
@@ -63,7 +63,7 @@ Foam::wallBoilingModels::nucleateFluxModel::New
         ) << abort(FatalIOError);
     }
 
-    return cstrIter()(dict);
+    return ctorPtr(dict);
 }
 
 
diff --git a/src/surfMesh/writers/common/surfaceWriter.C b/src/surfMesh/writers/common/surfaceWriter.C
index 2b412d9aae..15b59a0853 100644
--- a/src/surfMesh/writers/common/surfaceWriter.C
+++ b/src/surfMesh/writers/common/surfaceWriter.C
@@ -687,7 +687,7 @@ Foam::tmp<Foam::Field<Type>> Foam::surfaceWriter::adjustFieldTemplate
         // Rotate fields (vector and non-spherical tensors)
         if
         (
-            (pTraits<Type>::rank != 0 && pTraits<Type>::nComponents > 1)
+            (is_vectorspace<Type>::value && pTraits<Type>::nComponents > 1)
          && geometryTransform_.good()
          && !geometryTransform_.R().is_identity()
         )
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
index b9b6006abd..3e5dd49c62 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
@@ -219,22 +219,22 @@ void Foam::chemkinReader::addReactionType
         break;
 
         default:
-
+        {
             if (rType < 3)
             {
                 FatalErrorInFunction
-                    << "Reaction type " << reactionTypeNames[rType]
-                    << " on line " << lineNo_-1
-                    << " not handled by this function"
+                    << "Unhandled reaction type " << reactionTypeNames[rType]
+                    << " on line " << lineNo_-1 << nl
                     << exit(FatalError);
             }
             else
             {
                 FatalErrorInFunction
-                    << "Unknown reaction type " << rType
-                    << " on line " << lineNo_-1
+                    << "Unknown reaction type (" << int(rType)
+                    << "), on line " << lineNo_-1 << nl
                     << exit(FatalError);
             }
+        }
     }
 }
 
@@ -401,10 +401,8 @@ void Foam::chemkinReader::addPressureDependentReaction
         default:
         {
             FatalErrorInFunction
-                << "Fall-off function type "
-                << fallOffFunctionNames[fofType]
-                << " on line " << lineNo_-1
-                << " not implemented"
+                << "Fall-off function type (" << int(fofType)
+                << ") not implemented, line " << lineNo_-1
                 << exit(FatalError);
         }
     }
@@ -748,9 +746,8 @@ void Foam::chemkinReader::addReaction
         default:
         {
             FatalErrorInFunction
-                << "Reaction rate type " << reactionRateTypeNames[rrType]
-                << " on line " << lineNo_-1
-                << " not implemented"
+                << "Reaction rate type (" << int(rrType)
+                << ") not implemented, on line " << lineNo_-1
                 << exit(FatalError);
         }
     }