diff --git a/misc/fuel/fuel-font-lock.el b/misc/fuel/fuel-font-lock.el
index 5e438113f0..10561ded68 100644
--- a/misc/fuel/fuel-font-lock.el
+++ b/misc/fuel/fuel-font-lock.el
@@ -81,7 +81,7 @@
            (cond ((looking-at "USING: ") 'factor-font-lock-vocabulary-name)
                  ((looking-at "\\(TUPLE\\|SYMBOLS\\|VARS\\): ")
                   'factor-font-lock-symbol)
-                 (t 'font-lock-warning-face))))
+                 (t 'default))))
         (t 'factor-font-lock-comment)))
 
 (defconst fuel-font-lock--font-lock-keywords
diff --git a/misc/fuel/fuel-listener.el b/misc/fuel/fuel-listener.el
index 1655356227..f1be6a5607 100644
--- a/misc/fuel/fuel-listener.el
+++ b/misc/fuel/fuel-listener.el
@@ -68,7 +68,8 @@ buffer."
       (setq fuel-listener--buffer (current-buffer)))))
 
 (defun fuel-listener--start-process ()
-  (let ((factor (expand-file-name fuel-listener-factor-binary))
+  (let ((factor (locate-file (expand-file-name fuel-listener-factor-binary)
+                             '("") exec-suffixes))
         (image (expand-file-name fuel-listener-factor-image))
         (comint-redirect-perform-sanity-check nil))
     (unless (file-executable-p factor)