diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 98e5ff63ad..cd354c79ce 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -418,18 +418,18 @@ nh5pset_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue)
 
 /****if* H5Pf/h5pset_fill_value_c
  * NAME
- *        h5pset_fill_value_c
+ *  h5pset_fill_value_c
  * PURPOSE
- *     Call H5Pset_fill_value to set a fillvalue for a dataset
+ *  Call H5Pset_fill_value to set a fillvalue for a dataset
  * INPUTS
- *      prp_id - property list identifier
- *              type_id - datatype identifier (fill value is of type type_id)
- *              fillvalue - fillvalue
+ *  prp_id     - property list identifier
+ *  type_id    - datatype identifier (fill value is of type type_id)
+ *  fillvalue - fillvalue
  * RETURNS
- *     0 on success, -1 on failure
+ *  0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *              Saturday, August 14, 1999
+ *  Saturday, August 14, 1999
  * SOURCE
 */
 int_f
@@ -445,7 +445,7 @@ nh5pset_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
       * Call H5Pset_fill_value function.
       */
      c_prp_id = (hid_t)*prp_id;
-     c_type_id = (int)*type_id;
+     c_type_id = (hid_t)*type_id;
      ret = H5Pset_fill_value(c_prp_id, c_type_id, fillvalue);
 
      if (ret < 0) return ret_value;
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index dcfcfc4d0f..05e525dbf7 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -460,13 +460,13 @@ nh5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
 /*
  *  H5FD flags of type hid_t
  */
-    h5fd_hid_flags[0] = (int_f)H5FD_CORE;
-    h5fd_hid_flags[1] = (int_f)H5FD_FAMILY;
-    h5fd_hid_flags[2] = (int_f)H5FD_LOG;
-    h5fd_hid_flags[3] = (int_f)H5FD_MPIO;
-    h5fd_hid_flags[4] = (int_f)H5FD_MULTI;
-    h5fd_hid_flags[5] = (int_f)H5FD_SEC2;
-    h5fd_hid_flags[6] = (int_f)H5FD_STDIO;
+    h5fd_hid_flags[0] = (hid_t_f)H5FD_CORE;
+    h5fd_hid_flags[1] = (hid_t_f)H5FD_FAMILY;
+    h5fd_hid_flags[2] = (hid_t_f)H5FD_LOG;
+    h5fd_hid_flags[3] = (hid_t_f)H5FD_MPIO;
+    h5fd_hid_flags[4] = (hid_t_f)H5FD_MULTI;
+    h5fd_hid_flags[5] = (hid_t_f)H5FD_SEC2;
+    h5fd_hid_flags[6] = (hid_t_f)H5FD_STDIO;
 
 /*
  *  H5G flags