diff --git a/lib/dns/openssleddsa_link.c b/lib/dns/openssleddsa_link.c
index c8fb282c01..32bd02ef2b 100644
--- a/lib/dns/openssleddsa_link.c
+++ b/lib/dns/openssleddsa_link.c
@@ -518,7 +518,6 @@ static bool
 openssleddsa_isprivate(const dst_key_t *key) {
 	EVP_PKEY *pkey = key->keydata.pkey;
 	int len;
-	unsigned long err;
 
 	if (pkey == NULL)
 		return (false);
@@ -527,8 +526,9 @@ openssleddsa_isprivate(const dst_key_t *key) {
 	if (len > 0)
 		return (true);
 	/* can check if first error is EC_R_INVALID_PRIVATE_KEY */
-	while ((err = ERR_get_error()) != 0)
+	while (ERR_get_error() != 0) {
 		/**/;
+	}
 
 	return (false);
 }
diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index eb4eaaf378..bbd94c70c6 100644
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -1114,7 +1114,8 @@ trim_zbits(dns_rpz_zbits_t zbits, dns_rpz_zbits_t found) {
 	x = zbits & found;
 	x &= (~x + 1);
 	x = (x << 1) - 1;
-	return (zbits &= x);
+	zbits &= x;
+	return (zbits);
 }
 
 /*