diff --git a/buildman/manager/basemanager.py b/buildman/manager/basemanager.py
index 83c192d36..62514f072 100644
--- a/buildman/manager/basemanager.py
+++ b/buildman/manager/basemanager.py
@@ -17,7 +17,7 @@ class BaseManager(object):
         every few minutes. """
     self.job_heartbeat_callback(build_job)
 
-  def setup_time(self):
+  def overall_setup_time(self):
     """ Returns the number of seconds that the build system should wait before allowing the job
         to be picked up again after called 'schedule'.
     """
diff --git a/buildman/manager/enterprise.py b/buildman/manager/enterprise.py
index d74c50ea9..4a17bfc57 100644
--- a/buildman/manager/enterprise.py
+++ b/buildman/manager/enterprise.py
@@ -45,7 +45,7 @@ class EnterpriseManager(BaseManager):
     # production, build workers in enterprise are long-lived and register dynamically.
     self.register_component(REGISTRATION_REALM, DynamicRegistrationComponent)
 
-  def setup_time(self):
+  def overall_setup_time(self):
     # Builders are already registered, so the setup time should be essentially instant. We therefore
     # only return a minute here.
     return 60
diff --git a/buildman/server.py b/buildman/server.py
index 48806e21e..fea89ea05 100644
--- a/buildman/server.py
+++ b/buildman/server.py
@@ -143,6 +143,8 @@ class BuilderServer(object):
 
   def _job_complete(self, build_job, job_status, executor_name=None, update_phase=False):
     if job_status == BuildJobResult.INCOMPLETE:
+      logger.debug('[BUILD INCOMPLETE: job complete] Build ID: %s. No retry restore.',
+                   build_job.repo_build.uuid)
       self._queue.incomplete(build_job.job_item, restore_retry=False, retry_after=30)
     else:
       self._queue.complete(build_job.job_item)
@@ -177,6 +179,8 @@ class BuilderServer(object):
       try:
         build_job = BuildJob(job_item)
       except BuildJobLoadException as irbe:
+        logger.debug('[BUILD INCOMPLETE: job load exception] Jon data: %s. No retry restore.',
+                     job_item.body)
         logger.exception(irbe)
         self._queue.incomplete(job_item, restore_retry=False)
         continue
@@ -187,6 +191,8 @@ class BuilderServer(object):
       try:
         schedule_success, retry_timeout = yield From(self._lifecycle_manager.schedule(build_job))
       except:
+        logger.debug('[BUILD INCOMPLETE: scheduling] Build ID: %s. Retry restored.',
+                     build_job.repo_build.uuid)
         logger.exception('Exception when scheduling job: %s', build_job.repo_build.uuid)
         self._current_status = BuildServerStatus.EXCEPTION
         self._queue.incomplete(job_item, restore_retry=True, retry_after=WORK_CHECK_TIMEOUT)
@@ -201,6 +207,8 @@ class BuilderServer(object):
         logger.debug('Build job %s scheduled. Running: %s', build_job.repo_build.uuid,
                      self._job_count)
       else:
+        logger.debug('[BUILD INCOMPLETE: no schedule] Build ID: %s. Retry restored.',
+                     build_job.repo_build.uuid)
         logger.debug('All workers are busy for job %s Requeuing after %s seconds.',
                      build_job.repo_build.uuid, retry_timeout)
         self._queue.incomplete(job_item, restore_retry=True, retry_after=retry_timeout)