diff --git a/avbroot.py b/avbroot.py
old mode 100644
new mode 100755
index 746e235..ffae0b4
--- a/avbroot.py
+++ b/avbroot.py
@@ -306,6 +306,7 @@ def extract_subcommand(args):
             images, _, _ = get_images(manifest)
 
             print_status('Extracting', ', '.join(images), 'from the payload')
+            os.makedirs(args.directory, exist_ok=True)
             ota.extract_images(f, manifest, blob_offset, args.directory,
                                images)
 
diff --git a/avbroot/ota.py b/avbroot/ota.py
index cc9ae8b..c7418ba 100644
--- a/avbroot/ota.py
+++ b/avbroot/ota.py
@@ -14,7 +14,7 @@ import zipfile
 
 # Silence undesired warning
 orig_argv0 = sys.argv[0]
-sys.argv[0] = sys.argv[0].removesuffix('.py')
+sys.argv[0] = os.path.basename(sys.argv[0]).removesuffix('.py')
 import ota_utils
 sys.argv[0] = orig_argv0