diff --git a/setup/cli/modules/class.module.php b/setup/cli/modules/class.module.php
index c2321aa341f3419ebf3878af60af34c8eb5cc1ab..de28f7b398bd25cff179cc3ff4baeeb6c3259568 100644
--- a/setup/cli/modules/class.module.php
+++ b/setup/cli/modules/class.module.php
@@ -265,7 +265,7 @@ class Module {
                 continue;
             }
             // Allow multiple simple args like -Dvt
-            if ($arg[0] == '-' && strlen($arg) > 2) {
+            if ($arg[0] == '-' && $arg[1] != '-' && strlen($arg) > 2) {
                 foreach (str_split(substr($arg, 2)) as $O)
                     array_unshift($argv, "-{$O}");
                 $arg = substr($arg, 0, 2);
diff --git a/setup/cli/modules/deploy.php b/setup/cli/modules/deploy.php
index c616e321f9a2c5ad253b3e8c52e0d1da6eedce9f..096f4a125cc8703b72b76b030b067fa52dc8d060 100644
--- a/setup/cli/modules/deploy.php
+++ b/setup/cli/modules/deploy.php
@@ -202,7 +202,7 @@ class Deployment extends Unpacker {
             if ($dryrun)
                 continue;
             if (!is_dir(dirname($dst)))
-                mkdir(dirname($dst), 0751, true);
+                mkdir(dirname($dst), 0755, true);
             $this->copyFile($src, $dst, $hash, octdec($mode));
         }
     }
diff --git a/setup/cli/modules/unpack.php b/setup/cli/modules/unpack.php
index cc4b9d9d93a4058bfadab56239fd096540004b71..b064a435be9bbb2d4d990677bb7949467707570c 100644
--- a/setup/cli/modules/unpack.php
+++ b/setup/cli/modules/unpack.php
@@ -173,7 +173,7 @@ class Unpacker extends Module {
                 if ($dryrun)
                     continue;
                 if (!is_dir($destination))
-                    mkdir($destination, 0751, true);
+                    mkdir($destination, 0755, true);
                 $this->copyFile($file, $target, $hash);
             }
         }