diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
index 88c7dcfae0..75c028fe8e 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -394,7 +394,7 @@ Foam::cellShapeControlMesh::cellShapeControlMesh(const Time& runTime)
                 false
             );
 
-            if (io.typeHeaderOk<pointScalarField>())
+            if (io.typeHeaderOk<pointScalarField>(true))
             {
                 pointScalarField sizes(io, pointMesh::New(mesh));
 
diff --git a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
index 001c2c26f7..b1e39564a5 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,8 +55,7 @@ bool Foam::IOobject::typeHeaderOk(const bool checkType)
         {
             if (IOobject::debug)
             {
-                Info
-                    << "IOobject::typeHeaderOk() : "
+                InfoInFunction
                     << "file " << objectPath() << " could not be opened"
                     << endl;
             }
@@ -70,7 +69,7 @@ bool Foam::IOobject::typeHeaderOk(const bool checkType)
             {
                 if (checkType && headerClassName_ != Type::typeName)
                 {
-                    IOWarningIn("IOobject::typeHeaderOk()", (*isPtr))
+                    IOWarningInFunction(*isPtr)
                         << "unexpected class name " << headerClassName_
                         << " expected " << Type::typeName << endl;
 
@@ -81,7 +80,7 @@ bool Foam::IOobject::typeHeaderOk(const bool checkType)
             {
                 if (IOobject::debug)
                 {
-                    IOWarningIn("IOobject::typeHeaderOk()", (*isPtr))
+                    IOWarningInFunction(*isPtr)
                         << "failed to read header of file " << objectPath()
                         << endl;
                 }
@@ -108,7 +107,7 @@ void Foam::IOobject::warnNoRereading() const
 {
     if (readOpt() == IOobject::MUST_READ_IF_MODIFIED)
     {
-        WarningIn("IOobject::warnNoRereading()")
+        WarningInFunction
             << Type::typeName << ' ' << name()
             << " constructed with IOobject::MUST_READ_IF_MODIFIED"
             " but " << Type::typeName
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C
index a6f106c978..5a0532bd44 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.C
@@ -453,7 +453,7 @@ bool Foam::regIOobject::headerOk()
         {
             if (objectRegistry::debug)
             {
-                IOWarningIn("regIOobject::headerOk()", (*isPtr))
+                IOWarningInFunction(*isPtr)
                     << "failed to read header of file " << objectPath()
                     << endl;
             }