diff --git a/src/H5Abtree2.c b/src/H5Abtree2.c
index e289920fd1..15bc6f791b 100644
--- a/src/H5Abtree2.c
+++ b/src/H5Abtree2.c
@@ -289,7 +289,7 @@ H5A_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec)
     const H5A_dense_bt2_name_rec_t *bt2_rec = (const H5A_dense_bt2_name_rec_t *)_bt2_rec;
     herr_t ret_value;           /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_name_compare)
+    FUNC_ENTER_NOAPI_NOINIT(H5A_dense_btree2_name_compare)
 
     /* Sanity check */
     HDassert(bt2_udata);
diff --git a/src/H5RS.c b/src/H5RS.c
index 0a25a7efd4..065d05f430 100644
--- a/src/H5RS.c
+++ b/src/H5RS.c
@@ -230,7 +230,7 @@ H5RS_decr(H5RS_str_t *rs)
     /* Decrement reference count for string */
     if((--rs->n)==0) {
         if(!rs->wrapped)
-            H5FL_BLK_FREE(str_buf,rs->s);
+            (void)H5FL_BLK_FREE(str_buf,rs->s);
         H5FL_FREE(H5RS_str_t,rs);
     } /* end if */
 
diff --git a/src/H5Toh.c b/src/H5Toh.c
index 6e851f6939..2a4ee86083 100644
--- a/src/H5Toh.c
+++ b/src/H5Toh.c
@@ -219,7 +219,7 @@ H5O_dtype_get_oloc(hid_t obj_id)
     FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_get_oloc)
 
     /* Get the datatype */
-    if(NULL == (type = H5I_object(obj_id)))
+    if(NULL == (type = (H5T_t *)H5I_object(obj_id)))
         HGOTO_ERROR(H5E_OHDR, H5E_BADATOM, NULL, "couldn't get object from ID")
 
     /* Get the datatype's object header location */