diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
index 85c86b116..72febbc9c 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
@@ -70,18 +70,20 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
         #include "readControls.H"
-        #include "compressibleCourantNo.H"
-
-        #include "setDeltaT.H"
 
         {
-            // Store divrhoU from the previous time-step/mesh for the correctPhi
+            // Store divrhoU from the previous mesh so that it can be mapped
+            // and used in correctPhi to ensure the corrected phi has the
+            // same divergence
             volScalarField divrhoU
             (
                 "divrhoU",
                 fvc::div(fvc::absolute(phi, rho, U))
             );
 
+            #include "compressibleCourantNo.H"
+            #include "setDeltaT.H"
+
             runTime++;
 
             Info<< "Time = " << runTime.timeName() << nl << endl;
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
index dce4eaab2..7b65536a8 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
@@ -66,18 +66,20 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
         #include "readControls.H"
-        #include "compressibleCourantNo.H"
-
-        #include "setDeltaT.H"
 
         {
-            // Store divrhoU from the previous time-step/mesh for the correctPhi
+            // Store divrhoU from the previous mesh so that it can be mapped
+            // and used in correctPhi to ensure the corrected phi has the
+            // same divergence
             volScalarField divrhoU
             (
                 "divrhoU",
                 fvc::div(fvc::absolute(phi, rho, U))
             );
 
+            #include "compressibleCourantNo.H"
+            #include "setDeltaT.H"
+
             runTime++;
 
             Info<< "Time = " << runTime.timeName() << nl << endl;
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
index 55f5786e4..be86aa809 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
@@ -67,24 +67,19 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
         #include "readControls.H"
-        #include "CourantNo.H"
-        #include "setDeltaT.H"
 
-        runTime++;
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-        scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
-
-        // Do any mesh changes
-        mesh.update();
-
-        if (mesh.changing())
         {
-            Info<< "Execution time for mesh.update() = "
-                << runTime.elapsedCpuTime() - timeBeforeMeshUpdate
-                << " s" << endl;
+            #include "CourantNo.H"
+            #include "setDeltaT.H"
 
-            if (correctPhi)
+            runTime++;
+
+            Info<< "Time = " << runTime.timeName() << nl << endl;
+
+            // Do any mesh changes
+            mesh.update();
+
+            if (mesh.changing() && correctPhi)
             {
                 // Calculate absolute flux from the mapped surface velocity
                 phi = mesh.Sf() & Uf;