diff --git a/builder/templates/make-template.ml b/builder/templates/make-template.ml
index 7b46bdacb..f469ec2fd 100755
--- a/builder/templates/make-template.ml
+++ b/builder/templates/make-template.ml
@@ -120,7 +120,7 @@ let rec main () =
   (* Some architectures need EFI boot. *)
   let tmpefivars =
     match os, arch with
-    | (Fedora _|RHEL _), Aarch64 ->
+    | (Fedora _|RHEL _|Debian _), Aarch64 ->
        let vars = Sys.getcwd () // sprintf "%s.vars" tmpname in
        let cmd =
          sprintf "cp /usr/share/edk2/aarch64/vars-template-pflash.raw %s"
diff --git a/daemon/ntfs.c b/daemon/ntfs.c
index 878f6e58a..e5754ce3f 100644
--- a/daemon/ntfs.c
+++ b/daemon/ntfs.c
@@ -34,7 +34,7 @@
 int
 optgroup_ntfs3g_available (void)
 {
-  return prog_exists ("ntfs3g.probe");
+  return prog_exists ("ntfs-3g.probe");
 }
 
 int