diff --git a/src/H5Cimage.c b/src/H5Cimage.c
index 20cba7f34cc..74225c9c8b7 100644
--- a/src/H5Cimage.c
+++ b/src/H5Cimage.c
@@ -1161,7 +1161,7 @@ H5C__load_cache_image(H5F_t *f)
 
 done:
     if (ret_value < 0) {
-        if (H5_addr_defined(cache_ptr->image_addr))
+        if (H5F_addr_defined(cache_ptr->image_addr))
             cache_ptr->image_buffer = H5MM_xfree(cache_ptr->image_buffer);
     }
 
diff --git a/src/H5F.c b/src/H5F.c
index 9d19efb98a9..5fa62e30aca 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -616,7 +616,7 @@ H5Freopen(hid_t file_id)
 
 done:
     if (ret_value < 0 && new_file)
-        if (H5F__dest(new_file, FALSE) < 0)
+        if (H5F__dest(new_file, FALSE, TRUE) < 0)
             HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, H5I_INVALID_HID, "can't close file")
 
     FUNC_LEAVE_API(ret_value)
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 2ad2ce73840..10ad5395ca0 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -1478,7 +1478,7 @@ H5F__super_init(H5F_t *f)
 
         /* Check if the superblock has been allocated yet */
         if (sblock) {
-            if (non_default_fs_settings && H5_addr_defined(superblock_addr)) {
+            if (non_default_fs_settings && H5F_addr_defined(superblock_addr)) {
                 /*
                  * For non-default free-space settings, the allocation of
                  * space in the file for the superblock may have have allocated