diff --git a/modules/completion/helm/config.el b/modules/completion/helm/config.el
index b4906b2c8..59180026c 100644
--- a/modules/completion/helm/config.el
+++ b/modules/completion/helm/config.el
@@ -93,9 +93,10 @@ be negative.")
     ;; (as prescribed by the fuzzy flag) also in the following cases:
     ;; - helmized commands that use `completion-at-point' and similar functions
     ;; - native commands that fall back to `completion-styles' like `helm-M-x'
-    (if (< emacs-major-version 27)
-        (push (if fuzzy 'helm-flex 'helm) completion-styles)
-      (push (if fuzzy 'flex 'helm) completion-styles)))
+    (push (if EMACS27+
+              (if fuzzy 'flex 'helm)
+            (if fuzzy 'helm-flex 'helm))
+          completion-styles))
 
   :config
   (set-popup-rule! "^\\*helm" :vslot -100 :size 0.22 :ttl nil)
diff --git a/modules/lang/dart/config.el b/modules/lang/dart/config.el
index 5c7b633f1..ebcbae6dc 100644
--- a/modules/lang/dart/config.el
+++ b/modules/lang/dart/config.el
@@ -1,12 +1,12 @@
 ;;; lang/dart/config.el -*- lexical-binding: t; -*-
 
-(after! dart-mode
-  (when (featurep! +lsp)
-    (add-hook 'dart-mode-local-vars-hook #'lsp!)
-    (when (and (featurep! +flutter) IS-LINUX)
-      (when-let (path (doom-glob "/opt/flutter/bin/cache/dart-sdk"))
-        (setq lsp-dart-sdk-dir path)))))
-
+(use-package! dart-mode
+  :when (featurep! +lsp)
+  :hook (dart-mode-local-vars . lsp!)
+  :config
+  (when (and (featurep! +flutter) IS-LINUX)
+    (when-let (path (doom-glob "/opt/flutter/bin/cache/dart-sdk"))
+      (setq lsp-dart-sdk-dir path))))
 
 
 (use-package! flutter
diff --git a/modules/lang/java/+lsp.el b/modules/lang/java/+lsp.el
index 2d7cf01ac..ba7f84eb1 100644
--- a/modules/lang/java/+lsp.el
+++ b/modules/lang/java/+lsp.el
@@ -3,8 +3,8 @@
 
 (use-package! lsp-java
   :after lsp-clients
-  :init
-  (add-hook 'java-mode-local-vars-hook #'lsp!)
+  :hook (java-mode-local-vars . lsp!)
+  :preface
   (setq lsp-java-server-install-dir (concat doom-etc-dir "eclipse.jdt.ls/server/")
         lsp-java-workspace-dir (concat doom-etc-dir "java-workspace"))
   :config
diff --git a/modules/tools/lsp/config.el b/modules/tools/lsp/config.el
index f665104fd..d3f461cad 100644
--- a/modules/tools/lsp/config.el
+++ b/modules/tools/lsp/config.el
@@ -55,6 +55,8 @@ irrespective of what `+lsp-company-backend' is set to.")
     :definition #'lsp-find-definition
     :references #'lsp-find-references)
 
+  ;; TODO Lazy load these. They don't need to be loaded all at once unless the
+  ;;      user uses `lsp-install-server'.
   (when lsp-auto-configure
     (mapc (lambda (package) (require package nil t))
           lsp-client-packages))
diff --git a/modules/ui/doom-dashboard/config.el b/modules/ui/doom-dashboard/config.el
index caa6896e7..255f3b8d6 100644
--- a/modules/ui/doom-dashboard/config.el
+++ b/modules/ui/doom-dashboard/config.el
@@ -164,6 +164,7 @@ PLIST can have the following properties:
   "Face used for the title of menu widgets on the dashboard"
   :group 'doom-dashboard)
 
+
 ;;
 ;;; Major mode