diff --git a/etc/settings.csh b/etc/settings.csh
index dc312646e0..5eb326c5a5 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -112,7 +112,7 @@ case OpenFOAM:
     endif
 
     set compilerBin=$WM_COMPILER_DIR/bin
-    set compilerLib=$WM_COMPILER_DIR/lib$WM_COMPILER_LIB_ARCH:$WM_COMPILER_DIR/lib
+    set compilerLib=$WM_COMPILER_DIR/lib${WM_COMPILER_LIB_ARCH}:$WM_COMPILER_DIR/lib
     breaksw
 endsw
 
diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index 27366a7a7a..15b78e9653 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -1914,27 +1914,28 @@ void Foam::meshRefinement::baffleAndSplitMesh
 
         if (debug)
         {
-            // Dump all these faces to a faceSet.
-            faceSet problemGeom(mesh_, "problemFacesGeom", 100);
-
-            const labelList facePatchGeom
-            (
-                markFacesOnProblemCellsGeometric
-                (
-                    motionDict,
-                    globalToPatch
-                )
-            );
-            forAll(facePatchGeom, faceI)
-            {
-                if (facePatchGeom[faceI] != -1)
-                {
-                    problemGeom.insert(faceI);
-                }
-            }
-            Pout<< "Dumping " << problemGeom.size()
-                << " problem faces to " << problemGeom.objectPath() << endl;
-            problemGeom.write();
+            //- Note: commented out since not properly parallel yet.
+            //// Dump all these faces to a faceSet.
+            //faceSet problemGeom(mesh_, "problemFacesGeom", 100);
+            //
+            //const labelList facePatchGeom
+            //(
+            //    markFacesOnProblemCellsGeometric
+            //    (
+            //        motionDict,
+            //        globalToPatch
+            //    )
+            //);
+            //forAll(facePatchGeom, faceI)
+            //{
+            //    if (facePatchGeom[faceI] != -1)
+            //    {
+            //        problemGeom.insert(faceI);
+            //    }
+            //}
+            //Pout<< "Dumping " << problemGeom.size()
+            //    << " problem faces to " << problemGeom.objectPath() << endl;
+            //problemGeom.write();
 
 
             faceSet problemTopo(mesh_, "problemFacesTopo", 100);
diff --git a/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
index 5f5d89c29a..2f23e9706c 100644
--- a/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -539,27 +539,6 @@ void Foam::refinementSurfaces::findHigherIntersection
         return;
     }
 
-
-    // Precalculate per surface whether it has a minlevelfield
-    UPtrList<triSurfaceLabelField> minLevelFields(surfaces_.size());
-    forAll(surfaces_, surfI)
-    {
-        const searchableSurface& geom = allGeometry_[surfaces_[surfI]];
-
-        if (isA<triSurfaceMesh>(geom))
-        {
-            const triSurfaceMesh& triMesh = refCast<const triSurfaceMesh>(geom);
-            minLevelFields.set
-            (
-                surfI,
-               &const_cast<triSurfaceLabelField&>
-                (
-                    triMesh.lookupObject<triSurfaceLabelField>("minLevel")
-                )
-            );
-        }
-    }
-
     // Work arrays
     labelList hitMap(identity(start.size()));
     pointField p0(start);
@@ -568,7 +547,21 @@ void Foam::refinementSurfaces::findHigherIntersection
 
     forAll(surfaces_, surfI)
     {
-        allGeometry_[surfaces_[surfI]].findLineAny(p0, p1, hitInfo);
+        const searchableSurface& geom = allGeometry_[surfaces_[surfI]];
+
+        geom.findLineAny(p0, p1, hitInfo);
+
+        labelList minLevelField;
+        if (isA<triSurfaceMesh>(geom))
+        {
+            const triSurfaceMesh& triMesh = refCast<const triSurfaceMesh>(geom);
+            triMesh.getField
+            (
+                "minLevel",
+                hitInfo,
+                minLevelField
+            );
+        }
 
 
         // Copy all hits into arguments, continue with misses
@@ -581,14 +574,9 @@ void Foam::refinementSurfaces::findHigherIntersection
             if (hitInfo[hitI].hit())
             {
                 // Check if minLevelField for this surface.
-                if
-                (
-                    minLevelFields.set(surfI)
-                 && minLevelFields[surfI].size() > 0
-                )
+                if (minLevelField.size() > 0)
                 {
-                    minLocalLevel =
-                        minLevelFields[surfI][hitInfo[hitI].index()];
+                    minLocalLevel = minLevelField[hitI];
                 }
                 else
                 {
@@ -618,7 +606,7 @@ void Foam::refinementSurfaces::findHigherIntersection
         }
 
         // All done? Note that this decision should be synchronised
-        if (newI == 0)
+        if (returnReduce(newI, sumOp<label>()) == 0)
         {
             break;
         }
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index c181d2d5c1..a46c2f5d06 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -1280,8 +1280,8 @@ Foam::autoPtr<Foam::fvMesh> Foam::fvMeshDistribute::receiveMesh
             domainMesh.boundaryMesh()
         ).ptr();
     }
-    domainMesh.addFvPatches(patches);
-
+    // Add patches; no parallel comms
+    domainMesh.addFvPatches(patches, false);
 
     // Construct zones
     List<pointZone*> pZonePtrs(pointZoneNames.size());
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index c69f6c4533..f117968fe1 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -4765,69 +4765,70 @@ void Foam::hexRef8::checkRefinementLevels
     }
 
 
-    // Hanging points
-    {
-        // Any patches with points having only two edges.
-
-        boolList isHangingPoint(mesh_.nPoints(), false);
-
-        const polyBoundaryMesh& patches = mesh_.boundaryMesh();
-
-        forAll(patches, patchI)
-        {
-            const polyPatch& pp = patches[patchI];
-
-            const labelList& meshPoints = pp.meshPoints();
-
-            forAll(meshPoints, i)
-            {
-                label pointI = meshPoints[i];
-
-                const labelList& pEdges = mesh_.pointEdges()[pointI];
-
-                if (pEdges.size() == 2)
-                {
-                    isHangingPoint[pointI] = true;
-                }
-            }
-        }
-
-        syncTools::syncPointList
-        (
-            mesh_,
-            isHangingPoint,
-            andEqOp<bool>(),        // only if all decide it is hanging point
-            true,                   // null
-            false                   // no separation
-        );
-
-        //OFstream str(mesh_.time().path()/"hangingPoints.obj");
-
-        label nHanging = 0;
-
-        forAll(isHangingPoint, pointI)
-        {
-            if (isHangingPoint[pointI])
-            {
-                nHanging++;
-
-                Pout<< "Hanging boundary point " << pointI
-                    << " at " << mesh_.points()[pointI]
-                    << endl;
-                //meshTools::writeOBJ(str, mesh_.points()[pointI]);
-            }
-        }
-
-        if (returnReduce(nHanging, sumOp<label>()) > 0)
-        {
-            FatalErrorIn
-            (
-                "hexRef8::checkRefinementLevels(const label)"
-            )   << "Detected a point used by two edges only (hanging point)"
-                << nl << "This is not allowed"
-                << abort(FatalError);
-        }
-    }
+    //- Gives problems after first splitting off inside mesher.
+    //// Hanging points
+    //{
+    //    // Any patches with points having only two edges.
+    //
+    //    boolList isHangingPoint(mesh_.nPoints(), false);
+    //
+    //    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+    //
+    //    forAll(patches, patchI)
+    //    {
+    //        const polyPatch& pp = patches[patchI];
+    //
+    //        const labelList& meshPoints = pp.meshPoints();
+    //
+    //        forAll(meshPoints, i)
+    //        {
+    //            label pointI = meshPoints[i];
+    //
+    //            const labelList& pEdges = mesh_.pointEdges()[pointI];
+    //
+    //            if (pEdges.size() == 2)
+    //            {
+    //                isHangingPoint[pointI] = true;
+    //            }
+    //        }
+    //    }
+    //
+    //    syncTools::syncPointList
+    //    (
+    //        mesh_,
+    //        isHangingPoint,
+    //        andEqOp<bool>(),        // only if all decide it is hanging point
+    //        true,                   // null
+    //        false                   // no separation
+    //    );
+    //
+    //    //OFstream str(mesh_.time().path()/"hangingPoints.obj");
+    //
+    //    label nHanging = 0;
+    //
+    //    forAll(isHangingPoint, pointI)
+    //    {
+    //        if (isHangingPoint[pointI])
+    //        {
+    //            nHanging++;
+    //
+    //            Pout<< "Hanging boundary point " << pointI
+    //                << " at " << mesh_.points()[pointI]
+    //                << endl;
+    //            //meshTools::writeOBJ(str, mesh_.points()[pointI]);
+    //        }
+    //    }
+    //
+    //    if (returnReduce(nHanging, sumOp<label>()) > 0)
+    //    {
+    //        FatalErrorIn
+    //        (
+    //            "hexRef8::checkRefinementLevels(const label)"
+    //        )   << "Detected a point used by two edges only (hanging point)"
+    //            << nl << "This is not allowed"
+    //            << abort(FatalError);
+    //    }
+    //}
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
index 6ec5f6643e..2351ab9f8b 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
@@ -1330,7 +1330,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
 
     // Add the fvPatches
-    fvMeshSubsetPtr_().addFvPatches(newBoundary);
+    fvMeshSubsetPtr_().addFvPatches(newBoundary, syncPar);
 
     // Subset and add any zones
     subsetZones();
diff --git a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
index f138daa7a4..50e851296b 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
+++ b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.C
@@ -232,9 +232,9 @@ void Foam::searchableSurfaceWithGaps::findLine
         // do we accept the hit.
 
         List<pointIndexHit> plusInfo;
-        surface().findLine(start+offset0, end+offset0, plusInfo);
+        surface().findLine(compactStart+offset0, compactEnd+offset0, plusInfo);
         List<pointIndexHit> minInfo;
-        surface().findLine(start-offset0, end-offset0, minInfo);
+        surface().findLine(compactStart-offset0, compactEnd-offset0, minInfo);
 
         // Extract any hits
         forAll(plusInfo, i)
@@ -257,14 +257,28 @@ void Foam::searchableSurfaceWithGaps::findLine
                 compactStart[i] = compactStart[mapI];
                 compactEnd[i] = compactEnd[mapI];
                 compactMap[i] = compactMap[mapI];
+                offset0[i] = offset0[mapI];
+                offset1[i] = offset1[mapI];
             }
             compactStart.setSize(plusMissMap.size());
             compactEnd.setSize(plusMissMap.size());
             compactMap.setSize(plusMissMap.size());
+            offset0.setSize(plusMissMap.size());
+            offset1.setSize(plusMissMap.size());
 
 
-            surface().findLine(start+offset1, end+offset1, plusInfo);
-            surface().findLine(start-offset1, end-offset1, minInfo);
+            surface().findLine
+            (
+                compactStart+offset1,
+                compactEnd+offset1,
+                plusInfo
+            );
+            surface().findLine
+            (
+                compactStart-offset1,
+                compactEnd-offset1,
+                minInfo
+            );
 
             // Extract any hits
             forAll(plusInfo, i)
diff --git a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
index 1bdddb9706..a5392867f1 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
+++ b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
@@ -148,6 +148,8 @@ public:
 
         // Multiple point queries.
 
+            //- Find nearest on original surface. Note:does not use perturbation
+            //  and hence might be inconsistent with intersections.
             virtual void findNearest
             (
                 const pointField& sample,