diff --git a/lib/dns/tests/private_test.c b/lib/dns/tests/private_test.c
index e7e2d47dc9..e8e642d1ba 100644
--- a/lib/dns/tests/private_test.c
+++ b/lib/dns/tests/private_test.c
@@ -107,7 +107,7 @@ make_nsec3(nsec3_testcase_t *testcase, dns_rdata_t *private,
 	/* for simplicity, we're using a maximum salt length of 4 */
 	salt = htonl(testcase->salt);
 	sp = (unsigned char *) &salt;
-	while (*sp == '\0' && slen > 0) {
+	while (slen > 0 && *sp == '\0') {
 		slen--;
 		sp++;
 	}
diff --git a/lib/isc/task.c b/lib/isc/task.c
index 9af6914af4..7bfce3be63 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -1380,7 +1380,7 @@ isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
 		RUNTIME_CHECK(isc_thread_create(run, &manager->queues[i],
 						&manager->queues[i].thread)
 			      == ISC_R_SUCCESS);
-		char name[16];
+		char name[21];
 		snprintf(name, sizeof(name), "isc-worker%04u", i);
 		isc_thread_setname(manager->queues[i].thread, name);
 	}