diff --git a/vm/src/org.graalvm.maven.downloader/src/org/graalvm/maven/downloader/Main.java b/vm/src/org.graalvm.maven.downloader/src/org/graalvm/maven/downloader/Main.java
index c3ffbbe7e28a..f14e3865b068 100644
--- a/vm/src/org.graalvm.maven.downloader/src/org/graalvm/maven/downloader/Main.java
+++ b/vm/src/org.graalvm.maven.downloader/src/org/graalvm/maven/downloader/Main.java
@@ -106,7 +106,8 @@ static Arguments parseArguments(String... args) {
 
         if (repoUrl == null) {
             repoUrl = OptionProperties.getDefaultRepo();
-        } else if (!repoUrl.endsWith("/")) {
+        }
+        if (!repoUrl.endsWith("/")) {
             repoUrl = repoUrl + "/";
         }
         if (outputDir == null) {
diff --git a/vm/src/org.graalvm.maven.downloader/src/org/graalvm/maven/downloader/OptionProperties.java b/vm/src/org.graalvm.maven.downloader/src/org/graalvm/maven/downloader/OptionProperties.java
index e633c8d0881b..8f55d9aa93cb 100644
--- a/vm/src/org.graalvm.maven.downloader/src/org/graalvm/maven/downloader/OptionProperties.java
+++ b/vm/src/org.graalvm.maven.downloader/src/org/graalvm/maven/downloader/OptionProperties.java
@@ -75,10 +75,8 @@ public static String getExeName() {
     public static String getDefaultOutputDir() {
         if (RELATIVE_OUTPUT_DIR != null) {
             if (ImageInfo.inImageRuntimeCode()) {
-                if (ProcessProperties.getArgumentVectorBlockSize() > 0) {
-                    String progName = ProcessProperties.getArgumentVectorProgramName();
-                    return Paths.get(progName).resolve("..").resolve(RELATIVE_OUTPUT_DIR).normalize().toString();
-                }
+                String progName = ProcessProperties.getExecutableName();
+                return Paths.get(progName).resolve("..").resolve(RELATIVE_OUTPUT_DIR).normalize().toString();
             }
         }
         return "maven downloader output";