diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
index 8b090ff275..89105de655 100644
--- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
+++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -156,7 +156,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
     {
         if (i < Un-1)
         {
-            if (g != 0)
+            if (g*U_(i, l) != 0)
             {
                 for (label j=l; j<Un; j++)
                 {
@@ -199,7 +199,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition)
             U_(i, j) = 0;
         }
 
-        if (g != 0)
+        if (g*U_(i, i) != 0)
         {
             g = 1.0/g;
 
diff --git a/src/mesh/blockMesh/searchableExtrudedCircle/searchableExtrudedCircle.C b/src/mesh/blockMesh/searchableExtrudedCircle/searchableExtrudedCircle.C
index 9656656b77..3d1b3f76c2 100644
--- a/src/mesh/blockMesh/searchableExtrudedCircle/searchableExtrudedCircle.C
+++ b/src/mesh/blockMesh/searchableExtrudedCircle/searchableExtrudedCircle.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ Foam::searchableExtrudedCircle::searchableExtrudedCircle
             (
                 dict.lookup("file"),                // name
                 io.time().constant(),               // instance
-                "triSurface",                       // local
+                "geometry",                         // local
                 io.time(),                          // registry
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,