diff --git a/src/plugins/nvme/nvme-fabrics.c b/src/plugins/nvme/nvme-fabrics.c
index 918481f6..796b6bfc 100644
--- a/src/plugins/nvme/nvme-fabrics.c
+++ b/src/plugins/nvme/nvme-fabrics.c
@@ -272,7 +272,6 @@ gboolean bd_nvme_connect (const gchar *subsysnqn, const gchar *transport, const
                      "Could not determine HostID value from HostNQN '%s'",
                      host_nqn_val);
         g_free (host_nqn_val);
-        g_free (host_id_val);
         return FALSE;
     }
 
diff --git a/src/plugins/part.c b/src/plugins/part.c
index 7a3533b3..faf8d451 100644
--- a/src/plugins/part.c
+++ b/src/plugins/part.c
@@ -1712,8 +1712,10 @@ gboolean bd_part_resize_part (const gchar *disk, const gchar *part, guint64 size
 
     fdisk_unref_table (table);
 
-    /* XXX: double free in libfdisk, see https://github.com/karelzak/util-linux/pull/822
-    fdisk_unref_partition (pa); */
+    /* fixed in mass fdisk_ref_partition() in libfdisk 2.35,
+       see https://github.com/karelzak/util-linux/pull/822 */
+    if (fdisk_version >= 2350)
+        fdisk_unref_partition (pa);
     close_context (cxt);
 
     bd_utils_report_finished (progress_id, "Completed");