diff --git a/core/core-editor.el b/core/core-editor.el
index a641245c8..3fb9252fe 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -146,6 +146,7 @@ possible."
 
 (push '("/LICENSE\\'" . text-mode) auto-mode-alist)
 (push '("\\.log\\'" . text-mode) auto-mode-alist)
+(push '("\\.env\\'" . sh-mode) auto-mode-alist)
 
 
 ;;
@@ -418,7 +419,7 @@ files, so we replace calls to `pp' with the much faster `prin1'."
   (require 'smartparens-config)
 
   ;; Overlays are too distracting and not terribly helpful. show-parens does
-  ;; this for us already, so...
+  ;; this for us already (and is faster), so...
   (setq sp-highlight-pair-overlay nil
         sp-highlight-wrap-overlay nil
         sp-highlight-wrap-tag-overlay nil)
@@ -442,7 +443,7 @@ files, so we replace calls to `pp' with the much faster `prin1'."
 
   ;; Silence some harmless but annoying echo-area spam
   (dolist (key '(:unmatched-expression :no-matching-tag))
-    (setf (cdr (assq key sp-message-alist)) nil))
+    (setf (alist-get key sp-message-alist) nil))
 
   (add-hook! 'minibuffer-setup-hook
     (defun doom-init-smartparens-in-minibuffer-maybe-h ()
diff --git a/core/core-modules.el b/core/core-modules.el
index dec2c65c5..f58d9da4c 100644
--- a/core/core-modules.el
+++ b/core/core-modules.el
@@ -590,14 +590,14 @@ This is a wrapper around `eval-after-load' that:
 
 ;; DEPRECATED
 (defmacro def-package! (&rest args)
-  (make-obsolete 'def-package! 'use-package! "2.0.9")
   (message "`def-package!' was renamed to `use-package!'; use that instead.")
   `(use-package! ,@args))
+(make-obsolete 'def-package! 'use-package! "2.0.9")
 
 (defmacro def-package-hook! (&rest args)
-  (make-obsolete 'def-package-hook! 'use-package-hook! "2.0.9")
   (message "`def-package-hook!' was renamed to `use-package-hook!'; use that instead.")
   `(use-package-hook! ,@args))
+(make-obsolete 'def-package-hook! 'use-package-hook! "2.0.9")
 
 (provide 'core-modules)
 ;;; core-modules.el ends here
diff --git a/modules/config/default/autoload/default.el b/modules/config/default/autoload/default.el
index e7a40b750..dbe8726d3 100644
--- a/modules/config/default/autoload/default.el
+++ b/modules/config/default/autoload/default.el
@@ -245,12 +245,11 @@ If prefix ARG is set, prompt for a known project to search from."
                    (completing-read "Search project: " projects
                                     nil t nil nil (doom-project-root))
                  (user-error "There are no known projects"))
-             default-directory))
-         (this-command
-          (cond ((featurep! :completion ivy)  #'+ivy/project-search)
-                ((featurep! :completion helm) #'+helm/project-search)
-                (#'projectile-ripgrep))))
-    (call-interactively this-command)))
+             default-directory)))
+    (call-interactively
+     (cond ((featurep! :completion ivy)  #'+ivy/project-search)
+           ((featurep! :completion helm) #'+helm/project-search)
+           (#'projectile-ripgrep)))))
 
 ;;;###autoload
 (defun +default/search-other-project ()
diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el
index ebeadf06c..6c4887dcb 100644
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@@ -26,7 +26,7 @@
     (set-eval-handler! '(clojure-mode clojurescript-mode) #'cider-eval-region))
   :config
   (add-hook 'cider-mode-hook #'eldoc-mode)
-  (set-lookup-handlers! 'cider-mode
+  (set-lookup-handlers! '(cider-mode cider-repl-mode)
     :definition #'+clojure-cider-lookup-definition
     :documentation #'cider-doc)
   (set-popup-rules!
diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index 3d22d6c57..d525392ee 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -19,12 +19,12 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.")
 (use-package! elisp-mode
   :mode ("\\.Cask\\'" . emacs-lisp-mode)
   :config
-  (set-repl-handler! 'emacs-lisp-mode #'+emacs-lisp/open-repl)
-  (set-eval-handler! 'emacs-lisp-mode #'+emacs-lisp-eval)
+  (set-repl-handler! '(emacs-lisp-mode lisp-interaction-mode) #'+emacs-lisp/open-repl)
+  (set-eval-handler! '(emacs-lisp-mode lisp-interaction-mode) #'+emacs-lisp-eval)
   (set-lookup-handlers! 'emacs-lisp-mode
     :definition    #'elisp-def
     :documentation #'+emacs-lisp-lookup-documentation)
-  (set-docsets! 'emacs-lisp-mode "Emacs Lisp")
+  (set-docsets! '(emacs-lisp-mode lisp-interaction-mode) "Emacs Lisp")
   (set-pretty-symbols! 'emacs-lisp-mode :lambda "lambda")
   (set-rotate-patterns! 'emacs-lisp-mode
     :symbols '(("t" "nil")
diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el
index dfeb897c0..d318165a8 100644
--- a/modules/lang/org/packages.el
+++ b/modules/lang/org/packages.el
@@ -44,7 +44,7 @@
 (when (featurep! +gnuplot)
   (package! gnuplot)
   (package! gnuplot-mode))
-(when (featurep! +ipython)
+(when (featurep! +ipython) ; DEPRECATED
   (package! ob-ipython))
 (when (featurep! +jupyter)
   (package! jupyter))