diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 6ea5e472c0..89cb524c69 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -623,9 +623,9 @@ h5tools_count_ncols(const char *s)
  *
  * Purpose:  Recursive check for any variable length data in given type.
  *
- * Return:   TRUE : type conatains any variable length data
+ * Return:   TRUE : type contains any variable length data
  *           FALSE : type doesn't contain any variable length data
- *           Negative value: error occur
+ *           Negative value: failed
  *-------------------------------------------------------------------------
  */
 htri_t
@@ -652,9 +652,9 @@ done:
  *
  * Purpose:  Recursive check for variable length string of a datatype.
  *
- * Return:   TRUE : type conatains any variable length string
+ * Return:   TRUE : type contains any variable length string
  *           FALSE : type doesn't contain any variable length string
- *           Negative value: error occur
+ *           Negative value: failed
  *-------------------------------------------------------------------------
  */
 htri_t
@@ -1652,7 +1652,7 @@ render_bin_output_region_data_points(hid_t region_space, hid_t region_id,
  * Function: render_bin_output_region_points
  *
  * Purpose:  Print some values from a dataset referenced by region points.
- *           This is a special case subfunction to dump a region reference using points.
+ *           This is a special case function to dump a region reference using points.
  *
  * Return:   False if the last dimension has been reached
  *           True otherwise
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index 8e2e4f0cc5..770e19bf18 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -1440,7 +1440,7 @@ void
 print_user_block(const char *filename, hid_t fid)
 {
     int     ret_value = 0;
-    hid_t   fh = -1;   /* file handle  */
+    int     fh = -1;   /* file handle */
     hsize_t ub_size;   /* user block size */
     hsize_t size;      /* size read */
     hid_t   fcpl = -1; /* file creation property list ID for HDF5 file */