diff --git a/lib/isc/netmgr/tlsstream.c b/lib/isc/netmgr/tlsstream.c
index 73d217646b..a2a1567286 100644
--- a/lib/isc/netmgr/tlsstream.c
+++ b/lib/isc/netmgr/tlsstream.c
@@ -662,7 +662,7 @@ isc_nm_listentls(isc_nm_t *mgr, isc_nmiface_t *iface,
 	/* wait for listen result */
 	isc__nmsocket_attach(tlssock->outer, &tsock);
 	LOCK(&tlssock->outer->lock);
-	while (tlssock->outer->rchildren != tlssock->outer->nchildren) {
+	while (atomic_load(&tlssock->outer->rchildren) != tlssock->outer->nchildren) {
 		WAIT(&tlssock->outer->cond, &tlssock->outer->lock);
 	}
 	result = tlssock->outer->result;
diff --git a/lib/isc/task.c b/lib/isc/task.c
index 346b8e660f..e8210d149a 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -997,7 +997,7 @@ isc__taskmgr_shutdown(isc_taskmgr_t *manager) {
 
 	REQUIRE(VALID_MANAGER(manager));
 
-	XTHREADTRACE(e "isc_taskmgr_shutdown");
+	XTHREADTRACE("isc_taskmgr_shutdown");
 	/*
 	 * Only one non-worker thread may ever call this routine.
 	 * If a worker thread wants to initiate shutdown of the