diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el
index 82ef4feb7..cf8f30638 100644
--- a/modules/lang/org/packages.el
+++ b/modules/lang/org/packages.el
@@ -23,7 +23,7 @@
              (with-temp-file "org-version.el"
                (let ((version
                       (with-temp-buffer
-                        (insert-file-contents (doom-path "lisp/org.el") nil 0 1024)
+                        (insert-file-contents "lisp/org.el" nil 0 1024)
                         (if (re-search-forward "^;; Version: \\([^\n-]+\\)" nil t)
                             (match-string-no-properties 1)
                           "Unknown"))))
diff --git a/modules/os/macos/config.el b/modules/os/macos/config.el
index 06e9bea0a..98f59154c 100644
--- a/modules/os/macos/config.el
+++ b/modules/os/macos/config.el
@@ -35,7 +35,7 @@
 
 ;; Delete files to trash on macOS, as an extra layer of precaution against
 ;; accidentally deleting wanted files.
-(setq delete-by-moving-to-trash t)
+(setq delete-by-moving-to-trash (not noninteractive))
 
 
 ;;
diff --git a/modules/ui/doom-quit/config.el b/modules/ui/doom-quit/config.el
index 3e6f69702..b5cfb06e6 100644
--- a/modules/ui/doom-quit/config.el
+++ b/modules/ui/doom-quit/config.el
@@ -5,9 +5,7 @@
     "Please don't leave, there's more demons to toast!"
     "Let's beat it -- This is turning into a bloodbath!"
     ,(format "I wouldn't leave if I were you. %s is much worse."
-             (if (member system-type '(ms-dos-windows-nt cygwin))
-                 "DOS"
-               "UNIX"))
+             (if (featurep :system 'windows) "DOS" "UNIX"))
     "Don't leave yet -- There's a demon around that corner!"
     "Ya know, next time you come in here I'm gonna toast ya."
     "Go ahead and leave. See if I care."