diff --git a/bin/doom b/bin/doom
index 36bb10582..0baa1cd41 100755
--- a/bin/doom
+++ b/bin/doom
@@ -9,10 +9,11 @@
 :; exec $EMACS --script "$0" -- "$@"
 :; exit 0
 
-(let* ((loaddir (file-name-directory (file-truename load-file-name)))
+(let* ((load-prefer-newer t)
+       (loaddir (file-name-directory (file-truename load-file-name)))
        (emacsdir (getenv "EMACSDIR"))
-       (user-emacs-directory (or emacsdir (expand-file-name "../" loaddir)))
-       (load-prefer-newer t))
+       (user-emacs-directory
+        (abbreviate-file-name (or emacsdir (expand-file-name "../" loaddir)))))
 
   (push (expand-file-name "core" user-emacs-directory) load-path)
   (require 'core)
diff --git a/core/autoload/format.el b/core/autoload/format.el
index 4f87aaaa3..2be22513e 100644
--- a/core/autoload/format.el
+++ b/core/autoload/format.el
@@ -212,8 +212,9 @@ into faces or ANSI codes depending on the type of sesssion we're in."
 
 ;;;###autoload
 (defmacro print! (message &rest args)
-  "Uses `message' in interactive sessions and `princ' otherwise (prints to
-standard out).
+  "Prints MESSAGE, formatted with ARGS, to stdout.
+
+Always returns non-nil.
 
 Can be colored using (color ...) blocks:
 
diff --git a/core/autoload/sessions.el b/core/autoload/sessions.el
index e345cf18b..0d2833802 100644
--- a/core/autoload/sessions.el
+++ b/core/autoload/sessions.el
@@ -131,8 +131,7 @@
   (setq doom-autosave-session nil)
   (doom/quicksave-session)
   (restart-emacs
-   (delq
-    nil (append (if debug (list "--debug-init"))
-                (when (boundp 'chemacs-current-emacs-profile)
-                  (list "--with-profile" chemacs-current-emacs-profile))
-                (list "--restore")))))
+   (append (if debug (list "--debug-init"))
+           (when (boundp 'chemacs-current-emacs-profile)
+             (list "--with-profile" chemacs-current-emacs-profile))
+           (list "--restore"))))
diff --git a/modules/lang/rust/config.el b/modules/lang/rust/config.el
index 3f4652b5f..e728492e0 100644
--- a/modules/lang/rust/config.el
+++ b/modules/lang/rust/config.el
@@ -69,9 +69,9 @@
   :unless (featurep! +lsp)
   :hook (rustic-mode . racer-mode)
   :init
-  ;; Fix #2132: `racer' depends on `rust-mode', which tries to modify
-  ;; `auto-mode-alist'. We make extra sure that doesn't stick, especially when a
-  ;; buffer is reverted, as it is after rustfmt is done wiht it.
+  ;; HACK Fix #2132: `racer' depends on `rust-mode', which tries to modify
+  ;;      `auto-mode-alist'. We make extra sure that doesn't stick, especially
+  ;;      when a buffer is reverted, as it is after rustfmt is done wiht it.
   (after! rust-mode
     (setq auto-mode-alist (delete '("\\.rs\\'" . rust-mode) auto-mode-alist)))
   :config
diff --git a/modules/ui/popup/+hacks.el b/modules/ui/popup/+hacks.el
index c3a76e7a2..20f9ce799 100644
--- a/modules/ui/popup/+hacks.el
+++ b/modules/ui/popup/+hacks.el
@@ -37,8 +37,8 @@ to this commmand."
   (let ((orig-buffer (current-buffer)))
     (quit-window)
     (when (and (eq orig-buffer (current-buffer))
-               (+popup-window-p))
-      (+popup/close))))
+               (+popup-buffer-p))
+      (+popup/close nil 'force))))
 (global-set-key [remap quit-window] #'+popup/quit-window)