diff --git a/src/common/slurmdbd_defs.c b/src/common/slurmdbd_defs.c
index 7fabbf86e7638b6752618c0e3d0d21bdfda5e052..ee06be5b7536d2f93c51f97b49355f51f75ae00b 100644
--- a/src/common/slurmdbd_defs.c
+++ b/src/common/slurmdbd_defs.c
@@ -2129,7 +2129,7 @@ static void *_agent(void *x)
 						      &abs_time);
 			slurm_mutex_unlock(&agent_lock);
 			continue;
-		} else if ((cnt > 0) && ((cnt % 50) == 0))
+		} else if ((cnt > 0) && ((cnt % 100) == 0))
 			info("slurmdbd: agent queue size %u", cnt);
 		/* Leave item on the queue until processing complete */
 		if (agent_list) {
diff --git a/src/slurmctld/agent.c b/src/slurmctld/agent.c
index 51ea4cce552eb5320bd7cb719451525d49f0946f..3d6bfbacc8be394a0cd09dc1b75603330c2bba95 100644
--- a/src/slurmctld/agent.c
+++ b/src/slurmctld/agent.c
@@ -1270,10 +1270,10 @@ extern int agent_retry (int min_wait, bool mail_too)
 		static time_t last_msg_time = (time_t) 0;
 		uint32_t msg_type[5] = {0, 0, 0, 0, 0}, i = 0;
 		list_size = list_count(retry_list);
-		if ((list_size > 50) &&
+		if ((list_size > 100) &&
 		    (difftime(now, last_msg_time) > 300)) {
 			/* Note sizable backlog of work */
-			info("WARNING: agent retry_list size is %d",
+			info("slurmctld: agent retry_list size is %d",
 				list_size);
 			retry_iter = list_iterator_create(retry_list);
 			while ((queued_req_ptr = (queued_request_t *)
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index 9c1469870b3098dfa4fc0681e1433f507bfc2b5f..651a5101c738248dd367ec8f62c27da17aefd159 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -1763,7 +1763,8 @@ next_task:
 	}
 	xfree(sched_part_ptr);
 	xfree(sched_part_jobs);
-	if (slurmctld_config.server_thread_count >= 150) {
+	if ((slurmctld_config.server_thread_count >= 150) &&
+	    (defer_rpc_cnt == 0)) {
 		info("sched: %d pending RPCs at cycle end, consider "
 		     "configuring max_rpc_cnt",
 		     slurmctld_config.server_thread_count);