diff --git a/core/autoload/debug.el b/core/autoload/debug.el
index 2c2d1fe5e..997972c7a 100644
--- a/core/autoload/debug.el
+++ b/core/autoload/debug.el
@@ -6,8 +6,8 @@
   (interactive "d")
   (let ((hl-line-p (bound-and-true-p hl-line-mode)))
     (if hl-line-p (hl-line-mode -1))
-    (let ((face (or (get-char-property (point) 'read-face-name)
-                    (get-char-property (point) 'face))))
+    (let ((face (or (get-char-property pos 'read-face-name)
+                    (get-char-property pos 'face))))
       (if face (message "Face: %s" face) (message "No face at %d" pos)))
     (if hl-line-p (hl-line-mode 1))))
 
diff --git a/core/core-packages.el b/core/core-packages.el
index 8af0a7169..466d23df7 100644
--- a/core/core-packages.el
+++ b/core/core-packages.el
@@ -299,9 +299,9 @@ throw an error if the file doesn't exist."
                              ((stringp path) path)
                              ((listp path) (eval path))))
                   (and load-file-name   (file-name-directory load-file-name))
-                  (and buffer-file-name (file-name-directory buffer-file-name))
                   (and (bound-and-true-p byte-compile-current-file)
-                       (file-name-directory byte-compile-current-file)))))
+                       (file-name-directory byte-compile-current-file))
+                  (and buffer-file-name (file-name-directory buffer-file-name)))))
     (unless path
       (error "Could not find %s" filesym))
     (let ((file (expand-file-name (concat (symbol-name filesym) ".el") path)))
diff --git a/core/core-popups.el b/core/core-popups.el
index 3604e83ca..dff10b502 100644
--- a/core/core-popups.el
+++ b/core/core-popups.el
@@ -87,7 +87,8 @@ is enabled/disabled.'")
   :config
   (if (display-graphic-p)
       (shackle-mode +1)
-    (add-transient-hook! 'after-make-frame-functions (shackle-mode +1)))
+    (add-transient-hook! 'after-make-frame-functions (shackle-mode +1))
+    (add-hook 'after-init-hook 'shackle-mode))
 
   (defun doom*shackle-always-align (plist)
     "Ensure popups are always aligned and selected by default. Eliminates the need
diff --git a/modules/ui/doom-modeline/config.el b/modules/ui/doom-modeline/config.el
index de31dfd77..4c18c9667 100644
--- a/modules/ui/doom-modeline/config.el
+++ b/modules/ui/doom-modeline/config.el
@@ -154,7 +154,8 @@
   "Face for warnings in the modeline. Used by `*flycheck'"
   :group '+doom-modeline)
 
-(defface doom-modeline-urgent `((t (:inherit error)))
+(defface doom-modeline-urgent
+  `((t (:inherit error)))
   "Face for errors in the modeline. Used by `*flycheck'"
   :group '+doom-modeline)
 
diff --git a/modules/ui/doom/config.el b/modules/ui/doom/config.el
index 8f1636aec..8b2ae01ab 100644
--- a/modules/ui/doom/config.el
+++ b/modules/ui/doom/config.el
@@ -32,7 +32,7 @@
 ;; The native border "consumes" a pixel of the fringe on righter-most splits,
 ;; `window-divider' does not. Available since Emacs 25.1.
 (setq window-divider-default-places t
-      window-divider-default-bottom-width 1
+      window-divider-default-bottom-width 0
       window-divider-default-right-width 1)
 (window-divider-mode +1)