diff --git a/bin/mage b/bin/mage
index fed329b..162867f 100755
--- a/bin/mage
+++ b/bin/mage
@@ -2,7 +2,11 @@
 <?php
 date_default_timezone_set('UTC');
 
-require __DIR__ . '/../../../autoload.php';
+if (file_exists(__DIR__ . '/../../../autoload.php')) {
+    require __DIR__ . '/../../../autoload.php';
+} elseif (file_exists(__DIR__ . '/../vendor/autoload.php')) {
+    require __DIR__ . '/../vendor/autoload.php';
+}
 
 use Mage\MageApplication;
 
diff --git a/composer.json b/composer.json
index 6984c8e..68c8ed6 100644
--- a/composer.json
+++ b/composer.json
@@ -22,9 +22,8 @@
   },
   "autoload": {
     "psr-4": {
-      "Symfony\\Component\\": "src/Symfony/Component/"
+      "Mage\\": "src/Mage/"
     },
-    "psr-0": { "": "src/" },
     "exclude-from-classmap": [
       "**/Tests/"
     ]
@@ -33,4 +32,4 @@
     "bin-dir": "bin"
   },
   "bin": ["bin/mage"]
-}
\ No newline at end of file
+}
diff --git a/src/Mage/Command/BuiltIn/DeployCommand.php b/src/Mage/Command/BuiltIn/DeployCommand.php
index 07b2a27..8650e41 100644
--- a/src/Mage/Command/BuiltIn/DeployCommand.php
+++ b/src/Mage/Command/BuiltIn/DeployCommand.php
@@ -242,7 +242,7 @@ class DeployCommand extends AbstractCommand
             return true;
         }
 
-        if ($this->runtime->getWorkingHost() != null) {
+        if ($this->runtime->getWorkingHost()) {
             $output->writeln(sprintf('    Starting <fg=black;options=bold>%s</> tasks on host <fg=black;options=bold>%s</>:', $this->getStageName(), $this->runtime->getWorkingHost()));
         } else {
             $output->writeln(sprintf('    Starting <fg=black;options=bold>%s</> tasks:', $this->getStageName()));