diff --git a/modules/siren-smex.el b/modules/siren-smex.el
index fdf924f..f67f4d5 100644
--- a/modules/siren-smex.el
+++ b/modules/siren-smex.el
@@ -14,10 +14,8 @@
   ("C-c C-m" . smex)
   ("C-c C-c M-x" . execute-extended-command)
 
-  :init
-  (setq smex-save-file (expand-file-name ".smex-items" siren-savefile-dir))
-
   :config
+  (setq smex-save-file (expand-file-name ".smex-items" siren-savefile-dir))
   (smex-initialize))
 
 (provide 'siren-smex)
diff --git a/modules/siren-volatile-highlights.el b/modules/siren-volatile-highlights.el
index 9fef853..14071cc 100644
--- a/modules/siren-volatile-highlights.el
+++ b/modules/siren-volatile-highlights.el
@@ -7,8 +7,9 @@
 ;;; Code:
 
 (use-package volatile-highlights-mode
+  :demand
   :diminish volatile-highlights-mode
-  :init
+  :config
   (volatile-highlights-mode t))
 
 (provide 'siren-volatile-highlights)
diff --git a/modules/siren-yasnippet.el b/modules/siren-yasnippet.el
index 4b0f712..3fb1e00 100644
--- a/modules/siren-yasnippet.el
+++ b/modules/siren-yasnippet.el
@@ -9,8 +9,9 @@
 (use-package yasnippet-snippets)
 
 (use-package yasnippet
+  :demand
   :diminish yas-minor-mode
-  :init
+  :config
   (yas-global-mode t))
 
 (provide 'siren-yasnippet)