diff --git a/Source/Fortran/ErrorModule.f90 b/Source/Fortran/ErrorModule.f90
index bc8685ec..8dc30a53 100644
--- a/Source/Fortran/ErrorModule.f90
+++ b/Source/Fortran/ErrorModule.f90
@@ -159,7 +159,7 @@ RECURSIVE SUBROUTINE PrintError(this)
     !! Parameters
     TYPE(Error_t), INTENT(in) :: this
     !! Local Data
-    CHARACTER(len=80) :: error_string
+    CHARACTER(len=MPI_MAX_ERROR_STRING) :: error_string
     INTEGER :: error_string_len
     INTEGER :: error_string_error
     TYPE(Error_t) :: temp_error
diff --git a/Source/Fortran/NTMPIModule.f90 b/Source/Fortran/NTMPIModule.f90
index 19481617..467d9e23 100644
--- a/Source/Fortran/NTMPIModule.f90
+++ b/Source/Fortran/NTMPIModule.f90
@@ -2,9 +2,7 @@
 !> This module wraps the MPI include statement because on certain platforms
 !! just writing "USE MPI" does not work.
 MODULE NTMPIModule
-#if USE_MPIF08
-  USE MPI_F08
-#elif USE_MPIH
+#if USE_MPIH
   include "mpif.h"
 #else
   USE MPI