diff --git a/core/autoload/debug.el b/core/autoload/debug.el
index 1d8c5d885..de27982f5 100644
--- a/core/autoload/debug.el
+++ b/core/autoload/debug.el
@@ -115,7 +115,7 @@ markdown and copies it to your clipboard, ready to be pasted into bug reports!"
 branch and commit."
   (interactive)
   (require 'vc-git)
-  (print! "Doom v%s (Emacs v%s)\nBranch: %s\nCommit: %s."
+  (print! "Doom v%s (Emacs v%s)\nBranch: %s\nCommit: %s"
           doom-version
           emacs-version
           (or (vc-git--symbolic-ref doom-core-dir)
diff --git a/core/autoload/editor.el b/core/autoload/editor.el
index 380a6e4a1..527c28384 100644
--- a/core/autoload/editor.el
+++ b/core/autoload/editor.el
@@ -108,7 +108,7 @@ afterwards, kill line to beginning of line."
   (interactive)
   (let ((empty-line-p (save-excursion (beginning-of-line)
                                       (looking-at-p "[ \t]*$"))))
-    (funcall (if (featurep 'evil)
+    (funcall (if (fboundp 'evil-delete)
                  #'evil-delete
                #'delete-region)
              (point-at-bol) (point))
diff --git a/modules/app/calendar/config.el b/modules/app/calendar/config.el
index c1c9b0a43..197ed9f55 100644
--- a/modules/app/calendar/config.el
+++ b/modules/app/calendar/config.el
@@ -28,8 +28,7 @@
 
   (define-key cfw:calendar-mode-map "q" #'+calendar/quit)
 
-  (when (featurep 'solaire-mode)
-    (add-hook 'cfw:calendar-mode-hook #'solaire-mode))
+  (add-hook 'cfw:calendar-mode-hook #'doom|mark-buffer-as-real)
   (add-hook 'cfw:calendar-mode-hook 'hide-mode-line-mode)
 
   (advice-add #'cfw:render-button :override #'+calendar*cfw:render-button))
diff --git a/modules/feature/lookup/packages.el b/modules/feature/lookup/packages.el
index 67e05165f..c127ebbfc 100644
--- a/modules/feature/lookup/packages.el
+++ b/modules/feature/lookup/packages.el
@@ -5,7 +5,7 @@
 ;; be loaded before it is byte-compiled during installation. To ensure this, we
 ;; declare helm before dumb-jump.
 (when (featurep! :completion helm)
-  (depends-on! :completion helm))
+  (package! helm))
 
 ;;
 (package! dumb-jump)
diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index a67312d0c..02579ba42 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -11,9 +11,9 @@
 ;;
 ;; Config
 
-(add-to-list 'auto-mode-alist '("\\.Cask\\'" . emacs-lisp-mode))
-
-(after! elisp-mode
+(def-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-lookup-handlers! 'emacs-lisp-mode
diff --git a/modules/lang/latex/+viewers.el b/modules/lang/latex/+viewers.el
index 28dc06322..5a237f11d 100644
--- a/modules/lang/latex/+viewers.el
+++ b/modules/lang/latex/+viewers.el
@@ -1,6 +1,6 @@
 ;;; lang/latex/+viewers.el -*- lexical-binding: t; -*-
 
-(cl-block 'viewer
+(catch 'found-viewer
   (dolist (viewer +latex-viewers)
     (if (pcase viewer
           (`skim
@@ -29,7 +29,7 @@
              ;; Update PDF buffers after successful LaTeX runs
              (add-hook 'TeX-after-compilation-finished-function #'TeX-revert-document-buffer))))
 
-        (cl-return-from 'viewer)))
+        (throw 'found-viewer t)))
 
   ;; fall back to latex-preview-pane
   (add-to-list 'TeX-view-program-list '("preview-pane" latex-preview-pane-mode))
@@ -40,7 +40,6 @@
   (setq latex-preview-pane-multifile-mode 'auctex)
 
   (define-key! doc-view-mode-map
-    (kbd "ESC") #'delete-window
-    "q" #'delete-window
-    "k" (λ! (quit-window) (delete-window))))
-
+    "ESC" #'delete-window
+    "q"   #'delete-window
+    "k"   (λ! (quit-window) (delete-window))))