diff --git a/core/autoload/buffers.el b/core/autoload/buffers.el
index af0ab034e..bebaab2fd 100644
--- a/core/autoload/buffers.el
+++ b/core/autoload/buffers.el
@@ -315,6 +315,6 @@ project."
 
 ;;;###autoload
 (defun doom-set-buffer-real (buffer flag)
-  "Forcibly mark a buffer's real property, no matter what."
+  "Forcibly mark BUFFER as FLAG (non-nil = real)."
   (with-current-buffer buffer
     (setq doom-real-buffer-p flag)))
diff --git a/modules/feature/file-templates/config.el b/modules/feature/file-templates/config.el
index c8d42dd1c..72c4dcc40 100644
--- a/modules/feature/file-templates/config.el
+++ b/modules/feature/file-templates/config.el
@@ -6,6 +6,11 @@
   (expand-file-name "templates/" (file-name-directory load-file-name))
   "The path to a directory of yasnippet folders to use for file templates.")
 
+
+;;
+;; Plugins
+;;
+
 (def-package! autoinsert ; built-in
   :defer 1
   :init
@@ -18,10 +23,11 @@
   (auto-insert-mode 1)
 
   (defun +file-templates--expand (key &optional mode project-only)
-    "Auto insert a snippet of yasnippet into new file."
+    "Auto insert a yasnippet snippet into the blank file."
     (when (if project-only (doom-project-p) t)
       (require 'yasnippet)
-      (unless yas-minor-mode (yas-minor-mode-on))
+      (unless yas-minor-mode
+        (yas-minor-mode-on))
       (when (and yas-minor-mode
                  (yas-expand-snippet (yas-lookup-snippet key mode t))
                  (and (featurep 'evil) evil-mode)
diff --git a/modules/private/default/config.el b/modules/private/default/config.el
index 13e11ec3c..795f15fba 100644
--- a/modules/private/default/config.el
+++ b/modules/private/default/config.el
@@ -1,6 +1,6 @@
 ;;; private/default/config.el -*- lexical-binding: t; -*-
 
-(def-package! emacs-snippets)
+(def-package! emacs-snippets :after yasnippet)
 
 
 ;;