diff --git a/control/tap-ctl-allocate.c b/control/tap-ctl-allocate.c
index 3e0b39f8..452b217d 100644
--- a/control/tap-ctl-allocate.c
+++ b/control/tap-ctl-allocate.c
@@ -130,7 +130,7 @@ tap_ctl_allocate_minor(int *minor, char **minor_name)
 	if (err == -1) {
 		err = -errno;
 		EPRINTF("Failed to lock runtime directory %d\n", errno);
-		return err;
+		goto out;
 	}
 
 	for (id=0; id<MAX_ID; id++) {
diff --git a/control/tap-ctl-free.c b/control/tap-ctl-free.c
index fe246244..a9ed7081 100644
--- a/control/tap-ctl-free.c
+++ b/control/tap-ctl-free.c
@@ -60,7 +60,7 @@ tap_ctl_free(const int minor)
 	if (err == -1) {
 		err = -errno;
 		EPRINTF("Failed to lock runtime directory %d\n", errno);
-		return err;
+		goto out;
 	}
 
 	err = asprintf(&path, "%s/tapdisk-%d", BLKTAP2_NP_RUN_DIR, minor);
diff --git a/drivers/tapdisk-vbd.c b/drivers/tapdisk-vbd.c
index a68d1e42..09b0c7de 100644
--- a/drivers/tapdisk-vbd.c
+++ b/drivers/tapdisk-vbd.c
@@ -683,6 +683,8 @@ open_vbd_marker(int id)
        goto out;
    }
 
+   free(path);
+
    return fid;
 
 out: