diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index 35f08271fa..3b4075705e 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -7433,8 +7433,8 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
             BIND(C,NAME='h5pset_fapl_mpio_c')
          IMPORT :: HID_T
          IMPLICIT NONE
-         INTEGER(HID_T), INTENT(IN)  :: prp_id 
-         INTEGER       , INTENT(IN)  :: comm
+         INTEGER(HID_T), INTENT(IN) :: prp_id 
+         INTEGER       , INTENT(IN) :: comm
          INTEGER       , INTENT(IN) :: info
        END FUNCTION h5pset_fapl_mpio_c
     END INTERFACE
diff --git a/fortran/test/tf.F90 b/fortran/test/tf.F90
index aabccd3b40..109c62ebd4 100644
--- a/fortran/test/tf.F90
+++ b/fortran/test/tf.F90
@@ -461,9 +461,9 @@ CONTAINS
     CHARACTER(LEN=*), INTENT(in) :: a
 
 #ifdef H5_FORTRAN_HAVE_STORAGE_SIZE
-    H5_SIZEOF_CHR = storage_size(a, c_size_t)/storage_size(c_char_'a',c_size_t)
+    H5_SIZEOF_CHR = storage_size(a(1:1), c_size_t)/storage_size(c_char_'a',c_size_t)
 #else
-    H5_SIZEOF_CHR = SIZEOF(a)
+    H5_SIZEOF_CHR = SIZEOF(a(1:1))
 #endif
 
   END FUNCTION H5_SIZEOF_CHR