diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index ca37a793af..fb78a0838c 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -50,6 +50,7 @@ namespace Foam
 void Foam::fvMesh::clearGeomNotOldVol()
 {
     meshObject::clear<fvMesh, GeometricMeshObject>(*this);
+    meshObject::clear<lduMesh, GeometricMeshObject>(*this);
 
     slicedVolScalarField::DimensionedInternalField* VPtr =
         static_cast<slicedVolScalarField::DimensionedInternalField*>(VPtr_);
@@ -112,6 +113,7 @@ void Foam::fvMesh::clearGeom()
 void Foam::fvMesh::clearAddressing()
 {
     meshObject::clear<fvMesh, TopologicalMeshObject>(*this);
+    meshObject::clear<lduMesh, TopologicalMeshObject>(*this);
     deleteDemandDrivenData(lduPtr_);
 }
 
@@ -632,6 +634,7 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
     surfaceInterpolation::movePoints();
 
     meshObject::movePoints<fvMesh>(*this);
+    meshObject::movePoints<lduMesh>(*this);
 
     return tsweptVols;
 }
@@ -654,6 +657,7 @@ void Foam::fvMesh::updateMesh(const mapPolyMesh& mpm)
     clearAddressing();
 
     meshObject::updateMesh<fvMesh>(*this, mpm);
+    meshObject::updateMesh<lduMesh>(*this, mpm);
 }
 
 
diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
index ddefb95a85..f2fb5c6e4d 100644
--- a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+++ b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,7 @@ int yyFlexLexer::yylex()
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
 //! \cond dummy
-#if YY_FLEX_SUBMINOR_VERSION < 34
+#if YY_FLEX_SUBMINOR_VERSION < 34 || YY_FLEX_SUBMINOR_VERSION > 36
 extern "C" int yywrap()
 #else
 int yyFlexLexer::yywrap()