diff --git a/bin/paraFoam b/bin/paraFoam
index 867212e50c458c471de76f86a6bd76b9b1a2e171..e6465f0811b2cfb6f6c5d747774acbc8f818edf8 100755
--- a/bin/paraFoam
+++ b/bin/paraFoam
@@ -85,6 +85,7 @@ do
         ;;
     -builtin)
         extension=foam
+        requirePV=0
         shift
         ;;
     -case)
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index 14306e41fbc8e570921706fd0b2f8682249ca5ed..84b295c4d749ea20ebda9451948e47e87e33525b 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class objectRegistry Declaration
+                       Class objectRegistry Declaration
 \*---------------------------------------------------------------------------*/
 
 class objectRegistry
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
index 8c1ca52cf84265a939e663b751d2f925e0a19bcf..960605e049da4f9560f398d7270b6128d790963d 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
@@ -34,7 +34,7 @@ Foam::wordList Foam::objectRegistry::names() const
     wordList objectNames(size());
 
     label count=0;
-    for (const_iterator iter = begin(); iter != end(); ++iter)
+    forAllConstIter(HashTable<regIOobject*>, *this, iter)
     {
         if (isA<Type>(*iter()))
         {
@@ -56,9 +56,13 @@ Foam::HashTable<const Type*> Foam::objectRegistry::lookupClass
 {
     HashTable<const Type*> objectsOfClass(size());
 
-    for (const_iterator iter = begin(); iter != end(); ++iter)
+    forAllConstIter(HashTable<regIOobject*>, *this, iter)
     {
-        if ((strict && isType<Type>(*iter())) || isA<Type>(*iter()))
+        if
+        (
+            (strict && isType<Type>(*iter()))
+         || (!strict && isA<Type>(*iter()))
+        )
         {
             objectsOfClass.insert
             (
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/MapDimensionedFields.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/MapDimensionedFields.H
index b96c6ca666c0a783bf5d7997342b9501def880bc..1a82e698258e1ed391a150d08a1a5a5bd8f4251f 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/MapDimensionedFields.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/MapDimensionedFields.H
@@ -45,19 +45,7 @@ void MapDimensionedFields(const MeshMapper& mapper)
     typedef DimensionedField<Type, GeoMesh> FieldType;
     typedef HashTable<const FieldType*> TableType;
 
-    TableType fields(mapper.thisDb().size());
-
-    forAllConstIter(objectRegistry, mapper.thisDb(), iter)
-    {
-        if (isType<FieldType>(*iter()))
-        {
-            fields.insert
-            (
-                iter()->name(),
-                dynamic_cast<const FieldType*>(iter())
-            );
-        }
-    }
+    TableType fields(mapper.thisDb().template lookupClass<FieldType>(true));
 
     forAllConstIter(typename TableType, fields, fieldIter)
     {
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.C
index c3ecbbffafa8a41cfb21292e51b6db3fba667450..b959d7f75b7486ae5f2b40235051c2446672c03f 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.C
@@ -155,7 +155,7 @@ Foam::scalar Foam::COxidationHurtMitchell<CloudType>::calculate
     }
 
     // Char percentage
-    const scalar charPrc = Ychar/Ydaf*100.0;
+    const scalar charPrc = max(0, min(Ychar/(Ydaf + ROOTVSMALL)*100.0, 100));
 
     // Particle surface area
     const scalar Ap = constant::mathematical::pi*sqr(d);
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
index a56fcadf79df5a5065ef9484892f0e265ba18755..46b39ccb61aed15f9c113089cc3941c6288b7209 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
@@ -159,7 +159,7 @@ void Foam::sampledSurfaces::sampleAndWrite
     forAll(*this, surfI)
     {
         const sampledSurface& s = operator[](surfI);
-        Field<Type> values = s.sample(sField);
+        Field<Type> values(s.sample(sField));
         writeSurface<Type>(values, surfI, fieldName, outputDir);
     }
 }