diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
index 9c3a62428f..835e653544 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
@@ -185,6 +185,9 @@ public:
         //- Wrapper for MPI_Comm
         class Communicator;  // Forward Declaration
 
+        //- Wrapper for MPI_File routines
+        class File;  // Forward Declaration
+
         //- Wrapper for MPI_Request
         class Request;  // Forward Declaration
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamWindow.txx b/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamWindow.txx
index f3e614f929..9f7db58bfb 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamWindow.txx
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstreamWindow.txx
@@ -246,7 +246,7 @@ bool Foam::UPstream::Window::put
     else
     {
         // Use element or component type (or byte-wise) for data type
-        return this-put_data
+        return this->put_data
         (
             buffer,  // The data or cmpt pointer
             UPstream_dataType<Type>::size(count),
@@ -354,10 +354,10 @@ bool Foam::UPstream::Window::get
 {
     return this->get
     (
-         buffer.data(), buffer.size(),
-         fromProcNo,
-         target_disp
-     );
+        buffer.data(), buffer.size(),
+        fromProcNo,
+        target_disp
+    );
 }