diff --git a/bin/linja.in b/bin/linja.in
index 309fdf9fc..926f33e8f 100755
--- a/bin/linja.in
+++ b/bin/linja.in
@@ -309,7 +309,7 @@ def find_file_upward(name, path = os.getcwd()):
     return None
 
 def escape_ninja_char(name):
-    return name.replace("$", "$$").replace(":", "$:").replace(" ", "$ ")
+    return name.replace("$", "$$").replace(":", "$:").replace(" ", "$ ").replace("&", "$&")
 
 def normalize_drive_name(name):
     if platform.system() == "Windows":
@@ -414,7 +414,7 @@ def get_lean_options(args):
     if args.to_axiom:
         args.lean_options.append("--to_axiom")
     if args.cache:
-        args.lean_options += ["-c", '%s' % args.cache]
+        args.lean_options += ["-c", '"%s"' % args.cache]
     if args.lean_config_option:
         for item in args.lean_config_option:
             args.lean_options.append("-D" + item)