diff --git a/cylc/flow/scheduler.py b/cylc/flow/scheduler.py
index 013d68cbd32..43c4e0abe2f 100644
--- a/cylc/flow/scheduler.py
+++ b/cylc/flow/scheduler.py
@@ -447,7 +447,10 @@ def configure(self):
         LOG.info('Final point: %s', self.config.final_point, extra=log_extra)
 
         self.pool = TaskPool(
-            self.config, .suite_db_mgr, self.task_events_mgr, self.job_pool)
+            self.config,
+            self.suite_db_mgr,
+            self.task_events_mgr,
+            self.job_pool)
 
         self.profiler.log_memory("scheduler.py: before load_tasks")
         if self.is_restart:
diff --git a/cylc/flow/ws_data_mgr.py b/cylc/flow/ws_data_mgr.py
index bf5aed28b8c..ee648921385 100644
--- a/cylc/flow/ws_data_mgr.py
+++ b/cylc/flow/ws_data_mgr.py
@@ -163,7 +163,7 @@ def generate_definition_elements(self):
             setattr(workflow.time_zone_info, key, val)
 
         workflow.last_updated = update_time
-        workflow.run_mode = self.schd.run_mode
+        workflow.run_mode = config.run_mode()
         workflow.cycling_mode = config.cfg['scheduling']['cycling mode']
         workflow.workflow_log_dir = self.schd.suite_log_dir
         workflow.job_log_names.extend(list(JOB_LOG_OPTS.values()))
@@ -451,10 +451,10 @@ def update_workflow(self):
             status_string = (
                 SUITE_STATUS_RUNNING_TO_HOLD %
                 self.schd.pool.hold_point)
-        elif self.schd.stop_point:
+        elif self.schd.pool.stop_point:
             status_string = (
                 SUITE_STATUS_RUNNING_TO_STOP %
-                self.schd.stop_point)
+                self.schd.pool.stop_point)
         elif self.schd.stop_clock_time is not None:
             status_string = (
                 SUITE_STATUS_RUNNING_TO_STOP %
@@ -463,10 +463,10 @@ def update_workflow(self):
             status_string = (
                 SUITE_STATUS_RUNNING_TO_STOP %
                 self.schd.stop_task)
-        elif self.schd.final_point:
+        elif self.schd.config.final_point:
             status_string = (
                 SUITE_STATUS_RUNNING_TO_STOP %
-                self.schd.final_point)
+                self.schd.config.final_point)
         else:
             status_string = SUITE_STATUS_RUNNING
         workflow.status = status_string