diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c
index 237be9fec..30df1da21 100644
--- a/daemons/dmeventd/libdevmapper-event.c
+++ b/daemons/dmeventd/libdevmapper-event.c
@@ -710,7 +710,7 @@ static char *_fetch_string(char **src, const int delimiter)
 {
 	char *p, *ret;
 	size_t len = (p = strchr(*src, delimiter)) ?
-		p - *src : strlen(*src);
+		(size_t)(p - *src) : strlen(*src);
 
 	if ((ret = strndup(*src, len)))
 		*src += len + 1;
diff --git a/device_mapper/datastruct/bitset.c b/device_mapper/datastruct/bitset.c
index c99927cc1..080ed760e 100644
--- a/device_mapper/datastruct/bitset.c
+++ b/device_mapper/datastruct/bitset.c
@@ -150,7 +150,8 @@ dm_bitset_t dm_bitset_parse_list(const char *str, struct dm_pool *mem,
 				 size_t min_num_bits)
 {
 	unsigned a, b;
-	int c, old_c, totaldigits, ndigits, nmaskbits;
+	int c, old_c, totaldigits, ndigits;
+	size_t nmaskbits;
 	int at_start, in_range;
 	dm_bitset_t mask = NULL;
 	const char *start = str;