diff --git a/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.C
index bfa22a1406953b85574215f859554105a432903e..15566adf4467ec2a6e11e480bd20cb62b209c154 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.C
@@ -35,7 +35,8 @@ namespace Foam
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-selfContainedDirectMappedFixedValueFvPatchField<Type>::selfContainedDirectMappedFixedValueFvPatchField
+selfContainedDirectMappedFixedValueFvPatchField<Type>::
+selfContainedDirectMappedFixedValueFvPatchField
 (
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF
@@ -51,7 +52,8 @@ selfContainedDirectMappedFixedValueFvPatchField<Type>::selfContainedDirectMapped
 
 
 template<class Type>
-selfContainedDirectMappedFixedValueFvPatchField<Type>::selfContainedDirectMappedFixedValueFvPatchField
+selfContainedDirectMappedFixedValueFvPatchField<Type>::
+selfContainedDirectMappedFixedValueFvPatchField
 (
     const selfContainedDirectMappedFixedValueFvPatchField<Type>& ptf,
     const fvPatch& p,
@@ -129,7 +131,8 @@ selfContainedDirectMappedFixedValueFvPatchField
 
 
 template<class Type>
-selfContainedDirectMappedFixedValueFvPatchField<Type>::selfContainedDirectMappedFixedValueFvPatchField
+selfContainedDirectMappedFixedValueFvPatchField<Type>::
+selfContainedDirectMappedFixedValueFvPatchField
 (
     const selfContainedDirectMappedFixedValueFvPatchField<Type>& ptf
 )
@@ -144,7 +147,8 @@ selfContainedDirectMappedFixedValueFvPatchField<Type>::selfContainedDirectMapped
 
 
 template<class Type>
-selfContainedDirectMappedFixedValueFvPatchField<Type>::selfContainedDirectMappedFixedValueFvPatchField
+selfContainedDirectMappedFixedValueFvPatchField<Type>::
+selfContainedDirectMappedFixedValueFvPatchField
 (
     const selfContainedDirectMappedFixedValueFvPatchField<Type>& ptf,
     const DimensionedField<Type, volMesh>& iF
@@ -277,7 +281,8 @@ void selfContainedDirectMappedFixedValueFvPatchField<Type>::updateCoeffs()
             {
                 FatalErrorIn
                 (
-                    "void selfContainedDirectMappedFixedValueFvPatchField<Type>::"
+                    "void "
+                    "selfContainedDirectMappedFixedValueFvPatchField<Type>::"
                     "updateCoeffs()"
                 )<< "Unable to find sample patch " << samplePatch()
                  << " in region " << sampleRegion()
@@ -320,9 +325,10 @@ void selfContainedDirectMappedFixedValueFvPatchField<Type>::updateCoeffs()
         {
             FatalErrorIn
             (
-                "selfContainedDirectMappedFixedValueFvPatchField<Type>::updateCoeffs()"
-            )<< "Unknown sampling mode: " << mode()
-             << nl << abort(FatalError);
+                "selfContainedDirectMappedFixedValueFvPatchField<Type>::"
+                "updateCoeffs()"
+            )   << "Unknown sampling mode: " << mode()
+                << nl << abort(FatalError);
         }
     }
 
@@ -360,7 +366,8 @@ void selfContainedDirectMappedFixedValueFvPatchField<Type>::updateCoeffs()
 
 
 template<class Type>
-void selfContainedDirectMappedFixedValueFvPatchField<Type>::write(Ostream& os) const
+void selfContainedDirectMappedFixedValueFvPatchField<Type>::write(Ostream& os)
+const
 {
     fvPatchField<Type>::write(os);
     directMappedPatchBase::write(os);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.H
index 815663902fa1d2b4093a378dcd75289b09bc058a..0d76fb6d023124521c339d7d4976aa947081f1cd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/selfContainedDirectMapped/selfContainedDirectMappedFixedValueFvPatchField.H
@@ -126,7 +126,8 @@ public:
             const word& interpolationScheme
         );
 
-        //- Construct by mapping given selfContainedDirectMappedFixedValueFvPatchField
+        //- Construct by mapping given
+        //  selfContainedDirectMappedFixedValueFvPatchField
         //  onto a new patch
         selfContainedDirectMappedFixedValueFvPatchField
         (
@@ -147,7 +148,10 @@ public:
         {
             return tmp<fvPatchField<Type> >
             (
-                new selfContainedDirectMappedFixedValueFvPatchField<Type>(*this)
+                new selfContainedDirectMappedFixedValueFvPatchField<Type>
+                (
+                    *this
+                )
             );
         }
 
@@ -166,7 +170,11 @@ public:
         {
             return tmp<fvPatchField<Type> >
             (
-                new selfContainedDirectMappedFixedValueFvPatchField<Type>(*this, iF)
+                new selfContainedDirectMappedFixedValueFvPatchField<Type>
+                (
+                    *this,
+                    iF
+                )
             );
         }