diff --git a/lisp/doom-editor.el b/lisp/doom-editor.el
index 2159b885c..2827fde85 100644
--- a/lisp/doom-editor.el
+++ b/lisp/doom-editor.el
@@ -2,10 +2,8 @@
 ;;; Commentary:
 ;;; Code:
 
-(defvar doom-detect-indentation-excluded-modes
-  '(fundamental-mode pascal-mode so-long-mode doom-docs-org-mode)
-  "A list of major modes in which indentation should be automatically
-detected.")
+(defvar doom-detect-indentation-excluded-modes '(pascal-mode so-long-mode)
+  "A list of major modes where indentation shouldn't be auto-detected.")
 
 (defvar-local doom-inhibit-indent-detection nil
   "A buffer-local flag that indicates whether `dtrt-indent' should try to detect
@@ -502,8 +500,9 @@ files, so this replace calls to `pp' with the much faster `prin1'."
     (unless (or (not after-init-time)
                 doom-inhibit-indent-detection
                 doom-large-file-p
-                (memq major-mode doom-detect-indentation-excluded-modes)
-                (member (substring (buffer-name) 0 1) '(" " "*")))
+                (eq major-mode 'fundamental-mode)
+                (member (substring (buffer-name) 0 1) '(" " "*"))
+                (apply #'derived-mode-p doom-detect-indentation-excluded-modes))
       ;; Don't display messages in the echo area, but still log them
       (let ((inhibit-message (not init-file-debug)))
         (dtrt-indent-mode +1))))
diff --git a/modules/completion/vertico/config.el b/modules/completion/vertico/config.el
index dbace77fa..648c810c7 100644
--- a/modules/completion/vertico/config.el
+++ b/modules/completion/vertico/config.el
@@ -146,15 +146,14 @@ orderless."
         consult-async-min-input 2
         consult-async-refresh-delay  0.15
         consult-async-input-throttle 0.2
-        consult-async-input-debounce 0.1)
-  (if doom-projectile-fd-binary
-      (setq consult-fd-args
-            '(doom-projectile-fd-binary
-              "--color=never"
-              ;; https://github.com/sharkdp/fd/issues/839
-              "--full-path --absolute-path"
-              "--hidden --exclude .git"
-              (if (featurep :system 'windows) "--path-separator=/"))))
+        consult-async-input-debounce 0.1
+        consult-fd-args
+        '((if (executable-find "fdfind" 'remote) "fdfind" "fd")
+          "--color=never"
+          ;; https://github.com/sharkdp/fd/issues/839
+          "--full-path --absolute-path"
+          "--hidden --exclude .git"
+          (if (featurep :system 'windows) "--path-separator=/")))
 
   (consult-customize
    consult-ripgrep consult-git-grep consult-grep
diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el
index 3175268c3..db4a5b696 100644
--- a/modules/email/wanderlust/config.el
+++ b/modules/email/wanderlust/config.el
@@ -50,6 +50,7 @@
           "^List-.*:"
           "^Received-SPF:"
           "^DKIM-.*:"
+          "^DomainKey-Signature:"
           "^SPF-.*:"
           "^Autocrypt:"
           "^ARC-.*:"
diff --git a/modules/email/wanderlust/packages.el b/modules/email/wanderlust/packages.el
index 48203a6bd..d6ec56a78 100644
--- a/modules/email/wanderlust/packages.el
+++ b/modules/email/wanderlust/packages.el
@@ -8,7 +8,7 @@
 (package! flim :recipe (:branch "flim-1_14-wl") :pin "abdd2315006eb31476249223569808adb1c0f7b2")
 (package! semi :recipe (:branch "semi-1_14-wl") :pin "9063a4485b148a767ea924f0e7cc78d3524ba256")
 
-(package! wanderlust :pin "9fd2c65e8d690625f35035a71e73f51f740dbe04")
+(package! wanderlust :pin "c15e8ece4f34f10479e17cda19d10b98f6be3ec1")
 
 (when (modulep! +xface)
   (package! x-face-e21
diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index c0606dec4..087f95cf6 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -105,7 +105,6 @@ Is relative to `org-directory', unless it is absolute. Is used in Doom's default
 (defun +org-init-appearance-h ()
   "Configures the UI for `org-mode'."
   (setq org-indirect-buffer-display 'current-window
-        org-eldoc-breadcrumb-separator " → "
         org-enforce-todo-dependencies t
         org-entities-user
         '(("flat"  "\\flat" nil "" "" "266D" "♭")
@@ -814,14 +813,6 @@ Unlike showNlevels, this will also unfold parent trees."
                               :weight bold))))
       (apply fn args)))
 
-  (after! org-eldoc
-    ;; HACK Fix #2972: infinite recursion when eldoc kicks in in 'org' or
-    ;;      'python' src blocks.
-    ;; TODO Should be reported upstream!
-    (puthash "org" #'ignore org-eldoc-local-functions-cache)
-    (puthash "plantuml" #'ignore org-eldoc-local-functions-cache)
-    (puthash "python" #'python-eldoc-function org-eldoc-local-functions-cache))
-
   (defun +org--restart-mode-h ()
     "Restart `org-mode', but only once."
     (quiet! (org-mode-restart))
@@ -1194,6 +1185,20 @@ between the two."
   (add-hook 'kill-emacs-hook #'org-clock-save))
 
 
+(use-package! org-eldoc
+  ;; HACK: Fix #7633: this hook is no longer autoloaded by org-eldoc (in
+  ;;   org-contrib), so we have to add it ourselves.
+  :hook (org-mode . org-eldoc-load)
+  :init (setq org-eldoc-breadcrumb-separator " → ")
+  :config
+  ;; HACK Fix #2972: infinite recursion when eldoc kicks in in 'org' or 'python'
+  ;;   src blocks.
+  ;; TODO Should be reported upstream!
+  (puthash "org" #'ignore org-eldoc-local-functions-cache)
+  (puthash "plantuml" #'ignore org-eldoc-local-functions-cache)
+  (puthash "python" #'python-eldoc-function org-eldoc-local-functions-cache))
+
+
 (use-package! org-pdftools
   :when (modulep! :tools pdf)
   :commands org-pdftools-export