diff --git a/core/test/autoload-package.el b/core/test/autoload-package.el
index 5d074b0b7..22103070f 100644
--- a/core/test/autoload-package.el
+++ b/core/test/autoload-package.el
@@ -31,8 +31,7 @@
     (should (eq (doom-package-backend 'org) 'emacs))))
 
 (def-test! elpa-outdated-detection
-  (let* ((doom--last-refresh (current-time))
-         (package-alist
+  (let* ((package-alist
           `((doom-dummy ,(-pkg 'doom-dummy '(20160405 1234)))))
          (package-archive-contents
           `((doom-dummy ,(-pkg 'doom-dummy '(20170405 1234))))))
diff --git a/modules/completion/company/config.el b/modules/completion/company/config.el
index 6644ae417..2e2a44410 100644
--- a/modules/completion/company/config.el
+++ b/modules/completion/company/config.el
@@ -35,12 +35,9 @@ MODES should be one major-mode symbol or a list of them."
         company-require-match 'never
         company-global-modes '(not eshell-mode comint-mode erc-mode message-mode help-mode gud-mode)
         company-frontends '(company-pseudo-tooltip-frontend company-echo-metadata-frontend)
-        company-backends '(company-capf company-dabbrev company-ispell)
+        company-backends '(company-capf company-dabbrev company-ispell company-yasnippet)
         company-transformers '(company-sort-by-occurrence))
 
-  (after! yasnippet
-    (nconc company-backends '(company-yasnippet)))
-
   (global-company-mode +1))
 
 
@@ -71,16 +68,16 @@ MODES should be one major-mode symbol or a list of them."
 
 
 ;;
-;; Autoloads
+;; Included with company.el
 ;;
 
 (autoload 'company-capf "company-capf")
-(autoload 'company-yasnippet "company-yasnippet")
 (autoload 'company-dabbrev "company-dabbrev")
 (autoload 'company-dabbrev-code "company-dabbrev-code")
-(autoload 'company-etags "company-etags")
 (autoload 'company-elisp "company-elisp")
+(autoload 'company-etags "company-etags")
 (autoload 'company-files "company-files")
 (autoload 'company-gtags "company-gtags")
 (autoload 'company-ispell "company-ispell")
+(autoload 'company-yasnippet "company-yasnippet")
 
diff --git a/modules/feature/eval/config.el b/modules/feature/eval/config.el
index 227e04d2c..1a2565dd6 100644
--- a/modules/feature/eval/config.el
+++ b/modules/feature/eval/config.el
@@ -67,7 +67,7 @@ function that creates and returns the REPL buffer."
     (add-hook 'quickrun--mode-hook #'nlinum-mode))
   :config
   (set! :popup "^\\*\\(?:doom eval\\|Pp Eval Output\\|quickrun\\)"
-    '((window-height . 10)) '((transient . 0)))
+    '((window-height . 0.2)) '((transient . 0)))
 
   (defun +eval*quickrun-auto-close (&rest _)
     "Allows us to silently re-run quickrun from within the quickrun buffer."
diff --git a/modules/feature/popup/config.el b/modules/feature/popup/config.el
index 4fb69c621..91849ec51 100644
--- a/modules/feature/popup/config.el
+++ b/modules/feature/popup/config.el
@@ -19,7 +19,8 @@ Modifying this has no effect, unless done before feature/popup loads.
 
   If t, close the popup if ESC/C-g is pressed inside or outside of popups.
   If 'other, close this popup if ESC/C-g is pressed outside of any popup. This
-    is great for popups you just want to peek at and discard.
+    is great for popups you just want to peek at and discard, but might also
+    want to poke around in, without the risk of closing it from the inside.
   If 'current, close the current popup if ESC/C-g is pressed from inside of the
     popup.
   If nil, pressing ESC/C-g will never close this buffer.
@@ -63,7 +64,7 @@ a brief description of some native window parameters that Emacs uses:
 (defvar +popup-default-parameters
   '((transient . t)
     (quit . t))
-  "The default window parameters to add alists fed to `display-buffer-alist'.")
+  "The default window parameters.")
 
 (defvar +popup-ttl 10
   "The default time-to-live for transient buffers whose popup buffers have been
@@ -133,8 +134,7 @@ ALIST supports one custom parameter: `size', which will resolve to
 (setq +popup--display-buffer-alist (eval-when-compile +popup--display-buffer-alist))
 (add-hook 'doom-init-ui-hook #'+popup-mode)
 
-(add-hook '+popup-buffer-mode-hook #'+popup|adjust-fringes)
-(add-hook '+popup-buffer-mode-hook #'+popup|set-modeline)
+(add-hook! '+popup-buffer-mode-hook #'(+popup|adjust-fringes +popup|set-modeline))
 
 
 ;;
@@ -213,9 +213,9 @@ ALIST supports one custom parameter: `size', which will resolve to
   (set! :popup "^ \\*Org todo"  '((size . 5))  '((transient . 0)))
   (set! :popup "^\\*Org Agenda" '((size . 20)))
 
-  ;; Org has a scorched-earth window management system I'm not fond of. i.e.
-  ;; it kills all windows and monopolizes the frame. No thanks. We can do
-  ;; better with shackle's help.
+  ;; Org has a scorched-earth window management system I'm not fond of. i.e. it
+  ;; kills all windows and monopolizes the frame. No thanks. We can do better
+  ;; ourselves.
   (defun +popup*suppress-delete-other-windows (orig-fn &rest args)
     (cl-letf (((symbol-function 'delete-other-windows)
                (symbol-function 'ignore)))