diff --git a/ReleaseNotes-dev b/ReleaseNotes-dev
index 81161c42d7..67e9bc7f33 100644
--- a/ReleaseNotes-dev
+++ b/ReleaseNotes-dev
@@ -281,7 +281,7 @@
     to provide an in-line functionObject. E.g.
     #+BEGIN_SRC c++
     functions
-    (
+    {
         pAverage
         {
             functionObjectLibs ("libutilityFunctionObjects.so");
@@ -293,7 +293,7 @@
                 Info<<"p avg:" << average(p) << endl;
             #};
         }
-    );
+    }
     #+END_SRC
     See also [[./doc/changes/dynamicCode.org]]
 
diff --git a/doc/changes/dynamicCode.org b/doc/changes/dynamicCode.org
index 12217c6f6c..a6d9dbbe8e 100644
--- a/doc/changes/dynamicCode.org
+++ b/doc/changes/dynamicCode.org
@@ -104,7 +104,7 @@
   =functionObject=.
   #+BEGIN_SRC c++
   functions
-  (
+  {
       pAverage
       {
           functionObjectLibs ("libutilityFunctionObjects.so");
@@ -117,7 +117,7 @@
               Info<<"p avg:" << average(p) << endl;
           #};
       }
-  );
+  }
   #+END_SRC
   This dynamic code framework uses the following entries
   + =codeData=: declaration (in .H file) of local (null-constructable) data
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 95372bc96b..48e4b3a4df 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -1215,7 +1215,7 @@ Foam::fileNameList Foam::dlLoaded()
     {
         std::cout
             << "dlLoaded()"
-            << " : determined loaded libraries :" << libs.size() << endl;
+            << " : determined loaded libraries :" << libs.size() << std::endl;
     }
     return libs;
 }
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index de0ba87587..0c5945f464 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -213,6 +213,14 @@ void Foam::meshRefinement::updateIntersections(const labelList& changedFaces)
         }
     }
 
+    // Extend segments a bit
+    {
+        const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+        start += smallVec;
+        end -= smallVec;
+    }
+
+
     // Do tests in one go
     labelList surfaceHit;
     {
@@ -316,6 +324,14 @@ void Foam::meshRefinement::checkData()
             }
         }
 
+        // Extend segments a bit
+        {
+            const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+            start += smallVec;
+            end -= smallVec;
+        }
+
+
         // Do tests in one go
         labelList surfaceHit;
         {
@@ -2247,6 +2263,14 @@ void Foam::meshRefinement::dumpIntersections(const fileName& prefix) const
             }
         }
 
+        // Extend segments a bit
+        {
+            const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+            start += smallVec;
+            end -= smallVec;
+        }
+
+
         // Do tests in one go
         labelList surfaceHit;
         List<pointIndexHit> surfaceHitInfo;
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index c4846a0265..8f8a532e2c 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -283,6 +283,13 @@ void Foam::meshRefinement::getBafflePatches
         }
     }
 
+    // Extend segments a bit
+    {
+        const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+        start += smallVec;
+        end -= smallVec;
+    }
+
 
     // Do test for intersections
     // ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2447,6 +2454,13 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
             }
         }
 
+        // Extend segments a bit
+        {
+            const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+            start += smallVec;
+            end -= smallVec;
+        }
+
 
         // Do test for intersections
         // ~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
index c2e7a6ffd0..96821d4718 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
@@ -626,6 +626,13 @@ Foam::label Foam::meshRefinement::markSurfaceRefinement
         }
     }
 
+    // Extend segments a bit
+    {
+        const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+        start += smallVec;
+        end -= smallVec;
+    }
+
 
     // Do test for higher intersections
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -835,6 +842,14 @@ Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement
         }
     }
 
+    // Extend segments a bit
+    {
+        const vectorField smallVec(Foam::sqrt(SMALL)*(end-start));
+        start += smallVec;
+        end -= smallVec;
+    }
+
+
     // Test for all intersections (with surfaces of higher max level than
     // minLevel) and cache per cell the max surface level and the local normal
     // on that surface.