diff --git a/applications/solvers/modules/isothermalFilm/fvModels/filmVoFTransfer/filmToVoFTransfer.C b/applications/solvers/modules/isothermalFilm/fvModels/filmVoFTransfer/filmToVoFTransfer.C
index d40e735650..7c82361b88 100644
--- a/applications/solvers/modules/isothermalFilm/fvModels/filmVoFTransfer/filmToVoFTransfer.C
+++ b/applications/solvers/modules/isothermalFilm/fvModels/filmVoFTransfer/filmToVoFTransfer.C
@@ -130,10 +130,7 @@ void Foam::fv::filmToVoFTransfer::correct()
 
     const label patchiVoF = film_.surfacePatchMap().nbrPolyPatch().index();
 
-    const VoFtoFilmTransfer& VoFtoFilm
-    (
-        refCast<VoFtoFilmTransfer>(VoF_.fvModels()[0])
-    );
+    const VoFtoFilmTransfer& VoFtoFilm(this->VoFtoFilm(VoF_.fvModels()));
 
     const scalarField alphaVoF
     (
@@ -170,22 +167,11 @@ void Foam::fv::filmToVoFTransfer::correct()
 }
 
 
-template<class Type, class TransferRateFunc>
-Foam::tmp<Foam::VolInternalField<Type>>
-inline Foam::fv::filmToVoFTransfer::VoFToFilmTransferRate
+const Foam::fv::VoFtoFilmTransfer& Foam::fv::filmToVoFTransfer::VoFtoFilm
 (
-    TransferRateFunc transferRateFunc,
-    const dimensionSet& dimProp
+    const Foam::fvModels& fvModels
 ) const
 {
-    const Foam::fvModels& fvModels
-    (
-        fvModels::New
-        (
-            refCast<const fvMesh>(film_.surfacePatchMap().nbrMesh())
-        )
-    );
-
     const VoFtoFilmTransfer* VoFtoFilmPtr = nullptr;
 
     forAll(fvModels, i)
@@ -216,6 +202,26 @@ inline Foam::fv::filmToVoFTransfer::VoFToFilmTransferRate
             << exit(FatalError);
     }
 
+    return *VoFtoFilmPtr;
+}
+
+
+template<class Type, class TransferRateFunc>
+Foam::tmp<Foam::VolInternalField<Type>>
+inline Foam::fv::filmToVoFTransfer::VoFToFilmTransferRate
+(
+    TransferRateFunc transferRateFunc,
+    const dimensionSet& dimProp
+) const
+{
+    const Foam::fvModels& fvModels
+    (
+        fvModels::New
+        (
+            refCast<const fvMesh>(film_.surfacePatchMap().nbrMesh())
+        )
+    );
+
     tmp<VolInternalField<Type>> tSu
     (
         VolInternalField<Type>::New
@@ -229,7 +235,7 @@ inline Foam::fv::filmToVoFTransfer::VoFToFilmTransferRate
     UIndirectList<Type>(tSu.ref(), film_.surfacePatch().faceCells()) =
         film_.surfacePatchMap().fromNeighbour
         (
-            (VoFtoFilmPtr->*transferRateFunc)()
+            (VoFtoFilm(fvModels).*transferRateFunc)()
         );
 
     return tSu/mesh().V();
diff --git a/applications/solvers/modules/isothermalFilm/fvModels/filmVoFTransfer/filmToVoFTransfer.H b/applications/solvers/modules/isothermalFilm/fvModels/filmVoFTransfer/filmToVoFTransfer.H
index 3edbed5a94..0b1ef68eec 100644
--- a/applications/solvers/modules/isothermalFilm/fvModels/filmVoFTransfer/filmToVoFTransfer.H
+++ b/applications/solvers/modules/isothermalFilm/fvModels/filmVoFTransfer/filmToVoFTransfer.H
@@ -54,6 +54,8 @@ namespace Foam
 namespace fv
 {
 
+class VoFtoFilmTransfer;
+
 /*---------------------------------------------------------------------------*\
                        Class filmToVoFTransfer Declaration
 \*---------------------------------------------------------------------------*/
@@ -86,6 +88,8 @@ class filmToVoFTransfer
 
     // Private Member Functions
 
+        const VoFtoFilmTransfer& VoFtoFilm(const fvModels&) const;
+
         //- Return the transfer rate from the VoF transferRateFunc
         template<class Type, class TransferRateFunc>
         inline tmp<VolInternalField<Type>> VoFToFilmTransferRate
diff --git a/applications/solvers/modules/isothermalFilm/isothermalFilm.C b/applications/solvers/modules/isothermalFilm/isothermalFilm.C
index a6d3ac6e8f..bcc12327c9 100644
--- a/applications/solvers/modules/isothermalFilm/isothermalFilm.C
+++ b/applications/solvers/modules/isothermalFilm/isothermalFilm.C
@@ -138,8 +138,10 @@ bool Foam::solvers::isothermalFilm::initFilmMesh()
     if (nWallFaces != mesh.nCells())
     {
         FatalErrorInFunction
-            << "The number of filmWall faces in the mesh "
-               "is not equal to the number of cells"
+            << "The number of film wall faces in the mesh "
+            << nWallFaces
+            << " is not equal to the number of cells "
+            << mesh.nCells()
             << exit(FatalError);
     }
 
diff --git a/applications/utilities/mesh/generation/extrudeMesh/Make/options b/applications/utilities/mesh/generation/extrudeMesh/Make/options
index f6303eb8f9..e3a9b1bd59 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrudeMesh/Make/options
@@ -11,5 +11,5 @@ EXE_LIBS = \
     -lsurfMesh \
     -lmeshTools \
     -ldynamicMesh \
-    -lgenericPatches \
+    -lgenericPatchFields \
     -lextrudeModel
diff --git a/src/parcelSurfaceFilmModels/ThermoSurfaceFilm/ThermoSurfaceFilm.H b/src/parcelSurfaceFilmModels/ThermoSurfaceFilm/ThermoSurfaceFilm.H
index fa8a2bf52f..feefbc1db7 100644
--- a/src/parcelSurfaceFilmModels/ThermoSurfaceFilm/ThermoSurfaceFilm.H
+++ b/src/parcelSurfaceFilmModels/ThermoSurfaceFilm/ThermoSurfaceFilm.H
@@ -42,7 +42,6 @@ Description
 
 SourceFiles
     ThermoSurfaceFilm.C
-    ThermoSurfaceFilmI.H
 
 \*---------------------------------------------------------------------------*/