diff --git a/fortran/src/H5Lf.c b/fortran/src/H5Lf.c
index b6f0a8e02e..ed6d2e1470 100644
--- a/fortran/src/H5Lf.c
+++ b/fortran/src/H5Lf.c
@@ -344,7 +344,7 @@ done:
  * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5lexists_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, hid_t_f *link_exists)
+nh5lexists_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, int_f *link_exists)
 {
   char *c_name = NULL;          /* Buffer to hold C string */
   int_f ret_value = 0;          /* Return value */
@@ -358,7 +358,7 @@ nh5lexists_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, h
   /*
    * Call H5Lexists function.
    */
-  if((*link_exists = (hid_t_f)H5Lexists((hid_t)*loc_id, c_name, (hid_t)*lapl_id)) < 0)
+  if((*link_exists = (int_f)H5Lexists((hid_t)*loc_id, c_name, (hid_t)*lapl_id)) < 0)
          HGOTO_DONE(FAIL);
 
 done:
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index 40f5d7a825..b06be5871f 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -1187,7 +1187,7 @@ H5_FCDLL int_f nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len,
 H5_FCDLL int_f nh5ldelete_c( hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id ); /*MSB*/
 H5_FCDLL int_f nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
 				    int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id); /*MSB*/
-H5_FCDLL int_f nh5lexists_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, hid_t_f *link_exists); /*MSB*/
+H5_FCDLL int_f nh5lexists_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, int_f *link_exists); /*MSB*/
 H5_FCDLL int_f nh5lget_info_c (hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
 			       int_f *cset, int_f *corder, int_f *corder_valid, int_f *link_type, 
 			       int_f *address, hsize_t_f *link_len,
diff --git a/fortran/test/fortranlib_test_1_8.f90 b/fortran/test/fortranlib_test_1_8.f90
index 080c8d3ff0..3dafb55e3e 100644
--- a/fortran/test/fortranlib_test_1_8.f90
+++ b/fortran/test/fortranlib_test_1_8.f90
@@ -31,7 +31,7 @@ PROGRAM fortranlibtest
   CHARACTER(LEN=8) :: failure = '*FAILED*'
   CHARACTER(LEN=4) :: e_format ='(8a)'
   LOGICAL :: cleanup = .TRUE.
-  !     LOGICAL :: cleanup = .FALSE.
+!       LOGICAL :: cleanup = .FALSE.
 
   CALL h5open_f(error) 
   WRITE(*,*) '                       ==========================                            '
diff --git a/fortran/test/tH5A_1_8.f90 b/fortran/test/tH5A_1_8.f90
index 7af492db76..f038fe7b02 100644
--- a/fortran/test/tH5A_1_8.f90
+++ b/fortran/test/tH5A_1_8.f90
@@ -2984,7 +2984,6 @@ SUBROUTINE test_attr_dense_open( fcpl, fapl, total_error)
 
   ! /* Add attributes, until just before converting to dense storage */
 
-  write(*,*) max_compact
   DO u = 0, max_compact - 1
      ! /* Create attribute */
      WRITE(chr2,'(I2.2)') u
@@ -3718,6 +3717,7 @@ SUBROUTINE attr_open_check(fid, dsetname, obj_id, max_attrs, total_error )
      CALL VERIFY("h5aget_info_f.cset", cset, H5T_CSET_ASCII_F, total_error)
      CALL h5aget_storage_size_f(attr_id, storage_size, error)
      CALL check("h5aget_storage_size_f",error,total_error)
+     
      CALL VERIFY("h5aget_info_f.data_size", INT(data_size), INT(storage_size), total_error)
 
 
diff --git a/fortran/test/tH5G_1_8.f90 b/fortran/test/tH5G_1_8.f90
index d4dd9cddc4..092d90dbea 100644
--- a/fortran/test/tH5G_1_8.f90
+++ b/fortran/test/tH5G_1_8.f90
@@ -1238,7 +1238,7 @@ SUBROUTINE lifecycle(cleanup, fapl2, total_error)
   ! /* Query default group creation property settings */
   CALL H5Pget_local_heap_size_hint_f(gcpl, lheap_size_hint, error)
   CALL check("H5Pget_local_heap_size_hint_f",error,total_error)
-  CALL verify("H5Pget_local_heap_size_hint_f", lheap_size_hint,0,total_error)
+  CALL verify("H5Pget_local_heap_size_hint_f", INT(lheap_size_hint),0,total_error)
 
   CALL H5Pget_link_phase_change_f(gcpl, max_compact, min_dense, error)
   CALL check("H5Pget_link_phase_change_f", error, total_error)
@@ -1270,7 +1270,7 @@ SUBROUTINE lifecycle(cleanup, fapl2, total_error)
 
   CALL H5Pget_local_heap_size_hint_f(gcpl, lheap_size_hint, error)
   CALL check("H5Pget_local_heap_size_hint_f",error,total_error)
-  CALL verify("H5Pget_local_heap_size_hint_f", lheap_size_hint,LIFECYCLE_LOCAL_HEAP_SIZE_HINT,total_error)
+  CALL verify("H5Pget_local_heap_size_hint_f", INT(lheap_size_hint),INT(LIFECYCLE_LOCAL_HEAP_SIZE_HINT),total_error)
 
   CALL H5Pget_link_phase_change_f(gcpl, max_compact, min_dense, error)
   CALL check("H5Pget_link_phase_change_f", error, total_error)
diff --git a/fortran/test/tH5R.f90 b/fortran/test/tH5R.f90
index 9dfc3749bf..adcdfc7e59 100644
--- a/fortran/test/tH5R.f90
+++ b/fortran/test/tH5R.f90
@@ -147,21 +147,23 @@ SUBROUTINE refobjtest(cleanup, total_error)
   
   CALL H5Rget_name_f(dsetr_id, ref(1), buf, error, buf_size )
   CALL check("H5Rget_name_f", error, total_error)
-  CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T), total_error)
+ 
+
+  CALL VERIFY("H5Rget_name_f", INT(buf_size),7, total_error)
   CALL VerifyString("H5Rget_name_f", buf, "/GROUP1", total_error)
   
   ! with buffer bigger then needed
   
   CALL H5Rget_name_f(dsetr_id, ref(1), buf_big, error, buf_size )
   CALL check("H5Rget_name_f", error, total_error)
-  CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T),total_error)
+  CALL VERIFY("H5Rget_name_f", INT(buf_size),7,total_error)
   CALL VerifyString("H5Rget_name_f", TRIM(buf_big), "/GROUP1", total_error)
   
   ! getting path to dataset in /Group1
   
   CALL H5Rget_name_f(dsetr_id, ref(2), buf_big, error, buf_size )
   CALL check("H5Rget_name_f", error, total_error)
-  CALL VERIFY("H5Rget_name_f", buf_size,INT(14,SIZE_T),total_error)
+  CALL VERIFY("H5Rget_name_f", INT(buf_size),14,total_error)
   CALL VerifyString("H5Rget_name_f", TRIM(buf_big), "/GROUP1/GROUP2", total_error)
   
   !
@@ -371,14 +373,14 @@ SUBROUTINE refregtest(cleanup, total_error)
   ! Get name of the dataset the first region reference points to using H5Rget_name_f
   CALL H5Rget_name_f(dsetr_id, ref_out(1), buf, error, buf_size )
   CALL check("H5Rget_name_f", error, total_error)
-  CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T),total_error)
+  CALL VERIFY("H5Rget_name_f", INT(buf_size),7,total_error)
   CALL VerifyString("H5Rget_name_f", buf, "/MATRIX", total_error)
 
   ! Get name of the dataset the first region reference points to using H5Rget_name_f
   ! buffer bigger then needed
   CALL H5Rget_name_f(dsetr_id, ref_out(1), buf_big, error, buf_size )
   CALL check("H5Rget_name_f", error, total_error)
-  CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T),total_error)
+  CALL VERIFY("H5Rget_name_f", INT(buf_size),7,total_error)
   CALL VerifyString("H5Rget_name_f", TRIM(buf_big), "/MATRIX", total_error)
 
 
@@ -386,7 +388,7 @@ SUBROUTINE refregtest(cleanup, total_error)
   ! buffer smaller then needed
   CALL H5Rget_name_f(dsetr_id, ref_out(1), buf_small, error, buf_size )
   CALL check("H5Rget_name_f", error, total_error)
-  CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T),total_error)
+  CALL VERIFY("H5Rget_name_f", INT(buf_size),7,total_error)
   CALL VerifyString("H5Rget_name_f", TRIM(buf_small), "/MAT", total_error)
 
   !