diff --git a/core/autoload/debug.el b/core/autoload/debug.el
index 603bf7f44..91242db68 100644
--- a/core/autoload/debug.el
+++ b/core/autoload/debug.el
@@ -14,9 +14,9 @@
     gcmh-verbose
     init-file-debug
     jka-compr-verbose
+    (message-log-max . 16384)
     url-debug
-    use-package-verbose
-    (message-log-max . 16384))
+    use-package-verbose)
   "A list of variable to toggle on `doom-debug-mode'.
 
 Each entry can be a variable symbol or a cons cell whose CAR is the variable
diff --git a/core/autoload/themes.el b/core/autoload/themes.el
index c44be01fc..4e111fc4e 100644
--- a/core/autoload/themes.el
+++ b/core/autoload/themes.el
@@ -40,6 +40,7 @@ all themes. It will apply to all themes once they are loaded."
        (when (or (get 'doom-theme 'previous-themes)
                  (null doom-theme))
          (funcall #',fn))
+       ;; FIXME Prevent clobbering this on-the-fly
        (add-hook 'doom-customize-theme-hook #',fn 100))))
 
 ;;;###autoload
diff --git a/core/core-cli.el b/core/core-cli.el
index 905aaab0a..40e88b25e 100644
--- a/core/core-cli.el
+++ b/core/core-cli.el
@@ -51,9 +51,9 @@
         (setq dir (car tail))
         (let ((default-directory dir))
           (load (expand-file-name "subdirs.el") t inhibit-message t))
-        (or (string-prefix-p lispdir dir)
-            (let ((default-directory dir))
-              (load (expand-file-name "leim-list.el") t inhibit-message t)))
+        (unless (string-prefix-p lispdir dir)
+          (let ((default-directory dir))
+            (load (expand-file-name "leim-list.el") t inhibit-message t)))
         (setq tail (cdr tail)))
       (load site-run-file t inhibit-message))))
 
diff --git a/core/core-lib.el b/core/core-lib.el
index 5334b6d42..64e92312b 100644
--- a/core/core-lib.el
+++ b/core/core-lib.el
@@ -262,8 +262,8 @@ NAME, ARGLIST, and BODY are the same as `defun', `defun*', `defmacro', and
   "Run FORMS without generating any output.
 
 This silences calls to `message', `load', `write-region' and anything that
-writes to `standard-output'. In interactive sessions this won't suppress writing
-to *Messages*, only inhibit output in the echo area."
+writes to `standard-output'. In interactive sessions this inhibits output to the
+echo-area, but not to *Messages*."
   `(if doom-debug-p
        (progn ,@forms)
      ,(if doom-interactive-p
diff --git a/modules/completion/vertico/autoload/workspaces.el b/modules/completion/vertico/autoload/workspaces.el
index ecb7f43dc..b4646153c 100644
--- a/modules/completion/vertico/autoload/workspaces.el
+++ b/modules/completion/vertico/autoload/workspaces.el
@@ -60,7 +60,7 @@
 (autoload 'consult--multi "consult")
 ;;;###autoload
 (defun +vertico/switch-workspace-buffer (&optional force-same-workspace)
-  "Switch to another buffer in the same workspace.
+  "Switch to another buffer in the same or a specified workspace.
 
 Type the workspace's number (starting from 1) followed by a space to display its
 buffer list. Selecting a buffer in another workspace will switch to that
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 28e8d9025..5c3d71b68 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -1070,6 +1070,7 @@ between the two."
         (set-marker p nil)))))
 
 
+;; TODO Move to +encrypt flag
 (use-package! org-crypt ; built-in
   :commands org-encrypt-entries org-encrypt-entry org-decrypt-entries org-decrypt-entry
   :hook (org-reveal-start . org-decrypt-entry)
diff --git a/modules/term/vterm/config.el b/modules/term/vterm/config.el
index af8925cda..d52b57cf9 100644
--- a/modules/term/vterm/config.el
+++ b/modules/term/vterm/config.el
@@ -5,7 +5,7 @@
   :commands vterm-mode
   :hook (vterm-mode . doom-mark-buffer-as-real-h)
   :hook (vterm-mode . hide-mode-line-mode) ; modeline serves no purpose in vterm
-  :init
+  :preface
   ;; HACK Because vterm clusmily forces vterm-module.so's compilation on us when
   ;;      the package is loaded, this is necessary to prevent it when
   ;;      byte-compiling this file (`use-package' blocks eagerly loads packages
diff --git a/modules/ui/nav-flash/config.el b/modules/ui/nav-flash/config.el
index 845cb33d7..231a75a0f 100644
--- a/modules/ui/nav-flash/config.el
+++ b/modules/ui/nav-flash/config.el
@@ -13,6 +13,7 @@
 ;;
 ;;; Packages
 
+;; DEPRECATED To be replaced with pulsar.el when Emacs 28 support is dropped
 (use-package! nav-flash
   :defer t
   :init