diff --git a/checkin_notes b/checkin_notes
index 267ff968f8..0b642ab132 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -6417,3 +6417,13 @@ David  20 June 2006
 		app_start.C
 		client_state.C,h
 		cs_apps.C
+
+David  20 June 2006
+    - Manager: change menu item to "Attach to account manager"
+        I think it's OK to use "attach" in connection
+        with account managers as well as projects
+
+    client/
+        client_state.C
+    clientgui/
+        MainFrame.cpp
diff --git a/client/client_state.C b/client/client_state.C
index 21f8ca445d..d364b9d961 100644
--- a/client/client_state.C
+++ b/client/client_state.C
@@ -483,15 +483,11 @@ bool CLIENT_STATE::poll_slow_events() {
         POLL_ACTION(handle_pers_file_xfers , handle_pers_file_xfers );
     }
     POLL_ACTION(handle_finished_apps   , handle_finished_apps   );
-#ifdef NEW_CPU_SCHED
-    cpu_scheduler.enforce();
-#else
     if (!tasks_suspended) {
         POLL_ACTION(possibly_schedule_cpus, possibly_schedule_cpus          );
         POLL_ACTION(enforce_schedule    , enforce_schedule  );
         tasks_restarted = true;
     }
-#endif
     if (!network_suspended) {
         POLL_ACTION(scheduler_rpc          , scheduler_rpc_poll     );
     }
diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp
index f859278385..4056feb0e6 100644
--- a/clientgui/MainFrame.cpp
+++ b/clientgui/MainFrame.cpp
@@ -360,7 +360,7 @@ bool CMainFrame::CreateMenu() {
         );
         menuTools->Append(
             ID_PROJECTSATTACHACCOUNTMANAGER, 
-            _("&Account manager"),
+            _("Attach to &account manager"),
             _("Attach to an account manager")
         );
     } else {
diff --git a/doc/configuration.php b/doc/configuration.php
index e1e37cdc72..85614e6f0d 100644
--- a/doc/configuration.php
+++ b/doc/configuration.php
@@ -70,6 +70,7 @@ htmlspecialchars("
     [ <dont_delete_batches/> ]
     [ <sched_debug_level> N </sched_debug_level> ]
     [ <fuh_debug_level> N </fuh_debug_level> ]
+    [ <verify_files_on_app_start/> ]
 
 
     <!-- optional; defaults as indicated: -->
@@ -372,6 +373,15 @@ list_item("fuh_debug_level",
     "Verbosity level for file upload handler log output.
     1=minimal, 2=normal (default), 3=verbose."
 );
+list_item("verify_files_on_app_start",
+    "Before starting or restarting an app,
+    check contents of input files and app version files
+    by either MD5 or digital signature check.
+    Detects user tampering with file
+    (but doesn't really increase security,
+    since user could also change MD5s or signatures in
+    client state file)."
+);
 
 list_end();