diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index f13d908eb0..97311eef3c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -536,12 +536,7 @@ Foam::label Foam::DistributedDelaunayMesh<Triangulation>::referVertices
 
     if (!pointsNotInserted.empty())
     {
-        for
-        (
-            labelPairHashSet::const_iterator iter = pointsNotInserted.begin();
-            iter != pointsNotInserted.end();
-            ++iter
-        )
+        forAllConstIters(pointsNotInserted, iter)
         {
             if (receivedVertices.found(iter.key()))
             {
diff --git a/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.C b/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.C
index 9149eaf920..40d52a2fba 100644
--- a/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.C
+++ b/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.C
@@ -25,12 +25,16 @@ License
 
 #include "edgeFaceCirculator.H"
 #include "primitiveMesh.H"
+#include "nullObject.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 const Foam::edgeFaceCirculator Foam::edgeFaceCirculator::endConstIter
 (
-    *reinterpret_cast<primitiveMesh*>(0),       // primitiveMesh
+    *reinterpret_cast<const primitiveMesh*>
+    (
+        NullObject::nullObject.pointer()        // nullptr dummy
+    ),
     -1,                                         // faceLabel
     false,                                      // ownerSide
     -1,                                         // index