diff --git a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
index 6b88808921ad5767ba16ef6904899eeda3d0d567..39870e475533112c7825afe98ab24af59ab1796b 100644
--- a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
+++ b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
@@ -221,8 +221,7 @@ bool Foam::functionObjects::writeFile::read(const dictionary& dict)
             labelMinMax::ge(0)
         );
 
-    updateHeader_ =
-        dict.lookupOrDefault("updateHeader", updateHeader_);
+    updateHeader_ = dict.getOrDefault("updateHeader", updateHeader_);
 
     // Only write on master
     writeToFile_ =
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/T b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/T
index ff88c2732858f3e2d34800e6c9514f6fb1fe9885..73adcf8244ef59bcf918890a367f614461598df4 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/T
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/0.orig/T
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1912                                 |
+|  \\    /   O peration     | Version:  v2006                                 |
 |   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -27,33 +27,33 @@ boundaryField
         Ta              constant 300.0;
         h
         {
-            type            coded;
+            type        coded;
+
             codeInclude
             #{
                 #include "volFields.H"
             #};
+
             code
             #{
-                const objectRegistry& Db =
-                    patch_.boundaryMesh().mesh().thisDb();
-
-                const volScalarField& T =
-                    Db.lookupObject<volScalarField>("T");
+                const auto& T =
+                    patch_.boundaryMesh().mesh()
+                        .lookupObject<volScalarField>("T");
 
-                tmp<scalarField> thtc(new scalarField(patch_.size(), 300.0));
-                scalarField& htc =  thtc.ref();
+                auto thtc = tmp<scalarField>::New(patch_.size(), 300.0);
+                auto& htc = thtc.ref();
 
                 const scalarField Tp(T.boundaryField()[patch_.index()]);
 
-                forAll (htc, faceI)
+                forAll(htc, facei)
                 {
-                    if (Tp[faceI] >= 1000.0)
+                    if (Tp[facei] >= 1000.0)
                     {
-                        htc[faceI] = 800;
+                        htc[facei] = 800;
                     }
-                    else if (1000.0 >= Tp[faceI] >= 600.0)
+                    else if (Tp[facei] >= 600.0)
                     {
-                         htc[faceI] = 0.2*Tp[faceI]+200;
+                        htc[facei] = 0.2*Tp[facei]+200;
                     }
                 }