diff --git a/core/lib/defuns-compile.el b/core/lib/defuns-compile.el
index ae10f4095..d01ad7d82 100644
--- a/core/lib/defuns-compile.el
+++ b/core/lib/defuns-compile.el
@@ -9,17 +9,23 @@
           (f-directories narf-contrib-dir)
           (list narf-modules-dir narf-private-dir)))
 
+;;;###autoload
+(defun narf/is-compilable-p ()
+  (let ((file-name (buffer-file-name)))
+    (--any? (f-child-of? file-name it) (narf--compile-important-dirs))))
+
 ;;;###autoload (autoload 'narf:compile-el "defuns-compile" nil t)
 (evil-define-command narf:compile-el (&optional bang)
   :repeat nil
   (interactive "<!>")
   (when (eq major-mode 'emacs-lisp-mode)
-    (byte-recompile-file (! (f-expand "core-vars.el" narf-core-dir)) t 0)
-    (byte-recompile-file (! (f-expand "core-defuns.el" narf-core-dir)) t 0)
+    (byte-recompile-file (f-expand "core.el" narf-core-dir) t 0)
+    (byte-recompile-file (f-expand "core-vars.el" narf-core-dir) t 0)
+    (byte-recompile-file (f-expand "core-defuns.el" narf-core-dir) t 0)
     (if (not bang)
         (byte-recompile-file (buffer-file-name) t 0)
-      (byte-recompile-file (! (f-expand "init-load-path.el" narf-emacs-dir)) nil 0)
-      (byte-recompile-file (! (f-expand "init.el" narf-emacs-dir)) nil 0)
+      (byte-recompile-file (f-expand "init-load-path.el" narf-emacs-dir) nil 0)
+      (byte-recompile-file (f-expand "init.el" narf-emacs-dir) nil 0)
       (dolist (dir (narf--compile-important-dirs))
         (byte-recompile-directory dir 0 nil)))))
 
@@ -27,7 +33,9 @@
 (evil-define-command narf:compile-autoloads (&optional bang)
   :repeat nil
   (interactive "<!>")
-  (defvar generated-autoload-file (! (f-expand "autoloads.el" narf-core-dir)))
+  (defvar generated-autoload-file (expand-file-name "autoloads.el" narf-core-dir))
+  (when (and bang (file-exists-p generated-autoload-file))
+    (delete-file generated-autoload-file))
   (apply #'update-directory-autoloads (narf--compile-important-dirs)))
 
 (provide 'defuns-compile)