diff --git a/lib/crypto_backend/pbkdf_check.c b/lib/crypto_backend/pbkdf_check.c
index db65eabd..3f6ce9a5 100644
--- a/lib/crypto_backend/pbkdf_check.c
+++ b/lib/crypto_backend/pbkdf_check.c
@@ -151,7 +151,7 @@ static int next_argon2_params(uint32_t *t_cost, uint32_t *m_cost,
 	old_t_cost = *t_cost;
 	old_m_cost = *m_cost;
 
-	if (ms > target_ms) {
+	if ((uint32_t)ms > target_ms) {
 		/* decreasing, first try to lower t_cost, then m_cost */
 		num = (uint64_t)*t_cost * (uint64_t)target_ms;
 		denom = (uint64_t)ms;
diff --git a/lib/verity/verity_fec.c b/lib/verity/verity_fec.c
index 735e9237..91d42308 100644
--- a/lib/verity/verity_fec.c
+++ b/lib/verity/verity_fec.c
@@ -166,7 +166,7 @@ static int FEC_process_inputs(struct crypt_device *cd,
 
 			/* decoding from parity device */
 			if (decode) {
-				if (read_buffer(fd, &rs_block[ctx.rsn], ctx.roots) != ctx.roots) {
+				if (read_buffer(fd, &rs_block[ctx.rsn], ctx.roots) < 0) {
 					log_err(cd, _("Failed to read parity for RS block %" PRIu64 "."), n);
 					r = -EIO;
 					goto out;
@@ -185,7 +185,7 @@ static int FEC_process_inputs(struct crypt_device *cd,
 			} else {
 				/* encoding and writing parity data to fec device */
 				encode_rs_char(rs, rs_block, &rs_block[ctx.rsn]);
-				if (write_buffer(fd, &rs_block[ctx.rsn], ctx.roots) != ctx.roots) {
+				if (write_buffer(fd, &rs_block[ctx.rsn], ctx.roots) < 0) {
 					log_err(cd, _("Failed to write parity for RS block %" PRIu64 "."), n);
 					r = -EIO;
 					goto out;
diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index 60f461d0..380b8d95 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -979,8 +979,8 @@ static int set_pbkdf_params(struct crypt_device *cd, const char *dev_type)
 	pbkdf.hash = opt_hash ?: pbkdf_default->hash;
 	pbkdf.time_ms = (uint32_t)opt_iteration_time ?: pbkdf_default->time_ms;
 	if (strcmp(pbkdf.type, CRYPT_KDF_PBKDF2)) {
-		pbkdf.max_memory_kb = opt_pbkdf_memory ?: pbkdf_default->max_memory_kb;
-		pbkdf.parallel_threads = opt_pbkdf_parallel ?: pbkdf_default->parallel_threads;
+		pbkdf.max_memory_kb = (uint32_t)opt_pbkdf_memory ?: pbkdf_default->max_memory_kb;
+		pbkdf.parallel_threads = (uint32_t)opt_pbkdf_parallel ?: pbkdf_default->parallel_threads;
 	}
 
 	if (opt_pbkdf_iterations) {
diff --git a/src/cryptsetup_reencrypt.c b/src/cryptsetup_reencrypt.c
index 9c4111fb..48c040c8 100644
--- a/src/cryptsetup_reencrypt.c
+++ b/src/cryptsetup_reencrypt.c
@@ -481,8 +481,8 @@ static int set_pbkdf_params(struct crypt_device *cd, const char *dev_type)
 	pbkdf.hash = opt_hash ?: pbkdf_default->hash;
 	pbkdf.time_ms = (uint32_t)opt_iteration_time ?: pbkdf_default->time_ms;
 	if (strcmp(pbkdf.type, CRYPT_KDF_PBKDF2)) {
-		pbkdf.max_memory_kb = opt_pbkdf_memory ?: pbkdf_default->max_memory_kb;
-		pbkdf.parallel_threads = opt_pbkdf_parallel ?: pbkdf_default->parallel_threads;
+		pbkdf.max_memory_kb = (uint32_t)opt_pbkdf_memory ?: pbkdf_default->max_memory_kb;
+		pbkdf.parallel_threads = (uint32_t)opt_pbkdf_parallel ?: pbkdf_default->parallel_threads;
 	}
 
 	if (opt_pbkdf_iterations) {