diff --git a/src/grid/discretization_grid.f90 b/src/grid/discretization_grid.f90
index 738206f9a..8de2de6ef 100644
--- a/src/grid/discretization_grid.f90
+++ b/src/grid/discretization_grid.f90
@@ -27,14 +27,14 @@ module discretization_grid
   private
 
   integer,     dimension(3), public, protected :: &
-    grid                                                                                           !< (global) grid
+    grid                                                                                            !< (global) grid
   integer,                   public, protected :: &
-    grid3, &                                                                                       !< (local) grid in 3rd direction
+    grid3, &                                                                                        !< (local) grid in 3rd direction
     grid3Offset                                                                                     !< (local) grid offset in 3rd direction
   real(pReal), dimension(3), public, protected :: &
-    geomSize                                                                                       !< (global) physical size
+    geomSize                                                                                        !< (global) physical size
   real(pReal),               public, protected :: &
-    size3, &                                                                                       !< (local) size in 3rd direction
+    size3, &                                                                                        !< (local) size in 3rd direction
     size3offset                                                                                     !< (local) size offset in 3rd direction
 
   public :: &
diff --git a/src/parallelization.f90 b/src/parallelization.f90
index d9ca15981..29deaf724 100644
--- a/src/parallelization.f90
+++ b/src/parallelization.f90
@@ -53,6 +53,7 @@ contains
 subroutine parallelization_init
 
   integer(MPI_INTEGER_KIND) :: err_MPI, typeSize
+  character(len=4) :: rank_str
 !$ integer :: got_env, threadLevel
 !$ integer(pI32) :: OMP_NUM_THREADS
 !$ character(len=6) NumThreadsString
@@ -112,6 +113,7 @@ subroutine parallelization_init
 
   if (worldrank /= 0) then
     close(OUTPUT_UNIT)                                                                              ! disable output
+    write(rank_str,'(i4.4)') worldrank                                                              ! use for MPI debug filenames
     open(OUTPUT_UNIT,file='/dev/null',status='replace')                                             ! close() alone will leave some temp files in cwd
   endif