diff --git a/core/autoload/line-numbers.el b/core/autoload/line-numbers.el
index a02a7b899..10862f1fd 100644
--- a/core/autoload/line-numbers.el
+++ b/core/autoload/line-numbers.el
@@ -73,12 +73,12 @@ To change the type of line numbers displayed by default,
 customize `display-line-numbers-type'.  To change the type while
 the mode is on, set `display-line-numbers' directly."
   :lighter nil
-  (cond ((eq display-line-numbers-type 'relative)
+  (cond ((null display-line-numbers-type))
+        ((eq display-line-numbers-type 'relative)
          (if display-line-numbers-mode
              (nlinum-relative-off)
            (nlinum-relative-on)))
-        ((not (null display-line-numbers-type))
-         (nlinum-mode (if display-line-numbers-mode +1 -1)))))
+        ((nlinum-mode (if display-line-numbers-mode +1 -1)))))
 
 (defun display-line-numbers--turn-on ()
   "Turn on `display-line-numbers-mode'."
diff --git a/core/autoload/message.el b/core/autoload/message.el
index b475cb5ad..e00eb0236 100644
--- a/core/autoload/message.el
+++ b/core/autoload/message.el
@@ -57,7 +57,7 @@ Otherwise, it maps colors to a term-color-* face."
 (defmacro format! (message &rest args)
   "An alternative to `format' that understands (color ...) and converts them
 into faces or ANSI codes depending on the type of sesssion we're in."
-  `(cl-flet*
+  `(cl-flet
        (,@(mapcar (lambda (rule) `(,(car rule)
                               (lambda (message)
                                 (doom-ansi-apply ',(car rule) message))))