diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 3123aa4787..9438b1ca9a 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -581,7 +581,6 @@ void Foam::UPstream::waitRequest(const label i)
             << Foam::abort(FatalError);
     }
 
-    int flag;
     if
     (
         MPI_Wait
diff --git a/src/fileFormats/vtk/vtkUnstructuredReader.C b/src/fileFormats/vtk/vtkUnstructuredReader.C
index 5bb8b8d8f9..cec718d3af 100644
--- a/src/fileFormats/vtk/vtkUnstructuredReader.C
+++ b/src/fileFormats/vtk/vtkUnstructuredReader.C
@@ -34,47 +34,50 @@ License
 
 defineTypeNameAndDebug(Foam::vtkUnstructuredReader, 0);
 
-template<>
-const char*
-Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataType, 8>::names[] =
+namespace Foam
 {
-    "int",
-    "unsigned_int",
-    "long",
-    "unsigned_long",
-    "float",
-    "double",
-    "string",
-    "vtkIdType"
-};
-const Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataType, 8>
-Foam::vtkUnstructuredReader::vtkDataTypeNames;
+    template<>
+    const char*
+    NamedEnum<vtkUnstructuredReader::vtkDataType, 8>::names[] =
+    {
+        "int",
+        "unsigned_int",
+        "long",
+        "unsigned_long",
+        "float",
+        "double",
+        "string",
+        "vtkIdType"
+    };
+    const NamedEnum<vtkUnstructuredReader::vtkDataType, 8>
+    vtkUnstructuredReader::vtkDataTypeNames;
 
 
-template<>
-const char*
-Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataSetType, 3>::names[] =
-{
-    "FIELD",
-    "SCALARS",
-    "VECTORS"
-};
-const Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataSetType, 3>
-Foam::vtkUnstructuredReader::vtkDataSetTypeNames;
+    template<>
+    const char*
+    NamedEnum<vtkUnstructuredReader::vtkDataSetType, 3>::names[] =
+    {
+        "FIELD",
+        "SCALARS",
+        "VECTORS"
+    };
+    const NamedEnum<vtkUnstructuredReader::vtkDataSetType, 3>
+    vtkUnstructuredReader::vtkDataSetTypeNames;
 
 
-template<>
-const char*
-Foam::NamedEnum<Foam::vtkUnstructuredReader::parseMode, 5>::names[] =
-{
-    "NOMODE",
-    "UNSTRUCTURED_GRID",
-    "POLYDATA",
-    "CELL_DATA",
-    "POINT_DATA"
-};
-const Foam::NamedEnum<Foam::vtkUnstructuredReader::parseMode, 5>
-Foam::vtkUnstructuredReader::parseModeNames;
+    template<>
+    const char*
+    NamedEnum<vtkUnstructuredReader::parseMode, 5>::names[] =
+    {
+        "NOMODE",
+        "UNSTRUCTURED_GRID",
+        "POLYDATA",
+        "CELL_DATA",
+        "POINT_DATA"
+    };
+    const NamedEnum<vtkUnstructuredReader::parseMode, 5>
+    vtkUnstructuredReader::parseModeNames;
+}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/triSurface/triSurface/interfaces/AC3D/readAC.C b/src/triSurface/triSurface/interfaces/AC3D/readAC.C
index 27fbcf9dc4..2e122c936c 100644
--- a/src/triSurface/triSurface/interfaces/AC3D/readAC.C
+++ b/src/triSurface/triSurface/interfaces/AC3D/readAC.C
@@ -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-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -174,7 +174,13 @@ bool triSurface::readAC(const fileName& ACfileName)
 
     for (label patchI = 0; patchI < nPatches; patchI++)
     {
-        readUpto("OBJECT", ACfile, args, " while reading patch " + patchI);
+        readUpto
+        (
+            "OBJECT",
+            ACfile,
+            args,
+            " while reading patch " + Foam::name(patchI)
+        );
 
         // Object global values
         string patchName = string("patch") + name(patchI);