diff --git a/modules/lang/markdown/config.el b/modules/lang/markdown/config.el
index 450341a70..8df215bca 100644
--- a/modules/lang/markdown/config.el
+++ b/modules/lang/markdown/config.el
@@ -134,11 +134,12 @@ capture, the end position, and the output buffer.")
   (map! :map evil-markdown-mode-map
         :n "TAB" #'markdown-cycle
         :n [backtab] #'markdown-shifttab
-        :i "M-*" #'markdown-insert-list-item
-        :i "M-b" #'markdown-insert-bold
-        :i "M-i" #'markdown-insert-italic
-        :i "M-`" #'+markdown/insert-del
-        :i "M--" #'markdown-insert-hr
+        (:unless evil-disable-insert-state-bindings
+          :i "M-*" #'markdown-insert-list-item
+          :i "M-b" #'markdown-insert-bold
+          :i "M-i" #'markdown-insert-italic
+          :i "M-`" #'+markdown/insert-del
+          :i "M--" #'markdown-insert-hr)
         :n "M-r" #'browse-url-of-file
         :m "]h"  #'markdown-next-visible-heading
         :m "[h"  #'markdown-previous-visible-heading
diff --git a/modules/term/eshell/config.el b/modules/term/eshell/config.el
index f8e69ed2b..9cabb61b1 100644
--- a/modules/term/eshell/config.el
+++ b/modules/term/eshell/config.el
@@ -226,13 +226,17 @@ Emacs versions < 29."
 
 (use-package! eshell-did-you-mean
   :after esh-mode ; Specifically esh-mode, not eshell
-  :config
-  (eshell-did-you-mean-setup)
-  ;; HACK There is a known issue with `eshell-did-you-mean' where it does not
-  ;;      work on first invocation, so we invoke it once manually by setting the
-  ;;      last command and then calling the output filter.
-  (setq eshell-last-command-name "catt")
-  (eshell-did-you-mean-output-filter "catt: command not found"))
+  :config (eshell-did-you-mean-setup)
+
+  ;; HACK: `pcomplete-completions' returns a function, but
+  ;;   `eshell-did-you-mean--get-all-commands' unconditionally expects it to
+  ;;   return a list of strings, causing wrong-type-arg errors in many cases.
+  ;;   `all-completions' handles all these cases.
+  (defadvice! +eshell--fix-eshell-did-you-mean-a (&rest _)
+    :override #'eshell-did-you-mean--get-all-commands
+    (unless eshell-did-you-mean--all-commands
+      (setq eshell-did-you-mean--all-commands
+            (all-completions "" (pcomplete-completions))))))
 
 
 (use-package eshell-syntax-highlighting
diff --git a/modules/ui/vc-gutter/config.el b/modules/ui/vc-gutter/config.el
index 80b3f2314..d54f44a50 100644
--- a/modules/ui/vc-gutter/config.el
+++ b/modules/ui/vc-gutter/config.el
@@ -190,6 +190,7 @@ Respects `diff-hl-disable-on-remote'."
   ;; HACK: This advice won't work in *all* cases (it's a C function, and any
   ;;   calls to it from C won't trigger advice), but the thread issues above are
   ;;   triggered from Elisp's buffer API (from what I can tell).
-  (defadvice! +vc-gutter--kill-diff-hl-thread-a (buf)
+  (defadvice! +vc-gutter--kill-diff-hl-thread-a (&optional buf)
     :before #'kill-buffer
-    (with-current-buffer buf (+vc-gutter--kill-thread t))))
+    (with-current-buffer (or buf (current-buffer))
+      (+vc-gutter--kill-thread t))))