diff --git a/lib/luks2/luks2_disk_metadata.c b/lib/luks2/luks2_disk_metadata.c
index a3b5a1ac..4ed27bca 100644
--- a/lib/luks2/luks2_disk_metadata.c
+++ b/lib/luks2/luks2_disk_metadata.c
@@ -589,7 +589,8 @@ int LUKS2_disk_hdr_read(struct crypt_device *cd, struct luks2_hdr *hdr,
 	struct luks2_hdr_disk hdr_disk1, hdr_disk2;
 	char *json_area1 = NULL, *json_area2 = NULL;
 	json_object *jobj_hdr1 = NULL, *jobj_hdr2 = NULL;
-	int i, r;
+	unsigned int i;
+	int r;
 	uint64_t hdr_size;
 	uint64_t hdr2_offsets[] = LUKS2_HDR2_OFFSETS;
 
diff --git a/lib/setup.c b/lib/setup.c
index 97dc37d8..3985f728 100644
--- a/lib/setup.c
+++ b/lib/setup.c
@@ -1036,6 +1036,7 @@ static void crypt_free_type(struct crypt_device *cd)
 		crypt_free_volume_key(cd->u.integrity.journal_mac_key);
 	} else if (!cd->type) {
 		free(cd->u.none.active_name);
+		cd->u.none.active_name = NULL;
 	}
 
 	crypt_set_null_type(cd);
diff --git a/lib/utils_blkid.c b/lib/utils_blkid.c
index 2029b193..70412e09 100644
--- a/lib/utils_blkid.c
+++ b/lib/utils_blkid.c
@@ -139,8 +139,9 @@ int blk_superblocks_filter_luks(struct blkid_handle *h)
 {
 	int r = -ENOTSUP;
 #ifdef HAVE_BLKID
+	char luks[] = "crypto_LUKS";
 	char *luks_filter[] = {
-		"crypto_LUKS",
+		luks,
 		NULL
 	};
 	r = blkid_probe_filter_superblocks_type(h->pr, BLKID_FLTR_NOTIN, luks_filter);