diff --git a/applications/solvers/finiteArea/liquidFilmFoam/createFvFields.H b/applications/solvers/finiteArea/liquidFilmFoam/createFvFields.H
index d422eaef3a625220f7c9b25e790fba3318e16f69..f1260da95fddc665884b374682f0e922f7e68507 100644
--- a/applications/solvers/finiteArea/liquidFilmFoam/createFvFields.H
+++ b/applications/solvers/finiteArea/liquidFilmFoam/createFvFields.H
@@ -1,3 +1,6 @@
+// Volume-to surface mapping object
+const volSurfaceMapping vsm(aMesh);
+
 volVectorField U
 (
     IOobject
@@ -26,6 +29,3 @@ volScalarField H
     mesh,
     dimensionedScalar(dimLength, Zero)
 );
-
-// Create volume-to surface mapping object
-volSurfaceMapping vsm(aMesh);
diff --git a/applications/solvers/finiteArea/sphereSurfactantFoam/createVolFields.H b/applications/solvers/finiteArea/sphereSurfactantFoam/createVolFields.H
index 2f42dae83d971a8ba8794086d3575c80bf7200ac..b06ebaecb806cc587847b07590b73fd0995a146b 100644
--- a/applications/solvers/finiteArea/sphereSurfactantFoam/createVolFields.H
+++ b/applications/solvers/finiteArea/sphereSurfactantFoam/createVolFields.H
@@ -1,5 +1,5 @@
-    // Create volume-to surface mapping object
-    volSurfaceMapping vsm(aMesh);
+    // Volume-to surface mapping object
+    const volSurfaceMapping vsm(aMesh);
 
     volScalarField Cvf
     (
diff --git a/applications/solvers/finiteArea/surfactantFoam/createVolFields.H b/applications/solvers/finiteArea/surfactantFoam/createVolFields.H
index 2d1de76a61e2a3b878cc1790da299fbd8241b623..ea071e6f629034253a3a94443209c41472c6a270 100644
--- a/applications/solvers/finiteArea/surfactantFoam/createVolFields.H
+++ b/applications/solvers/finiteArea/surfactantFoam/createVolFields.H
@@ -1,5 +1,5 @@
-    // Create volume-to surface mapping object
-    volSurfaceMapping vsm(aMesh);
+    // Volume-to surface mapping object
+    const volSurfaceMapping vsm(aMesh);
 
     volScalarField Cvf
     (
diff --git a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
index 63dbf2d7a4b0fae71d695f364a9f1169537646da..5914db07984866256ecb4e92de961e7a376fbfa6 100644
--- a/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
+++ b/src/optimisation/adjointOptimisation/adjoint/optimisation/adjointSensitivity/incompressible/sensitivitySurface/sensitivitySurfaceIncompressible.C
@@ -305,7 +305,7 @@ void sensitivitySurface::smoothSensitivities()
     dimensionedScalar one("1", dimless, 1.);
 
     // Mapping engine
-    volSurfaceMapping vsm(aMesh);
+    const volSurfaceMapping vsm(aMesh);
 
     // Source term in faMatrix needs to be an areaField
     areaScalarField sens