diff --git a/Command/FormGenerateCommand.php b/Command/FormGenerateCommand.php
index 25f451a..e37b723 100644
--- a/Command/FormGenerateCommand.php
+++ b/Command/FormGenerateCommand.php
@@ -203,9 +203,9 @@ EOT
             'propel.builder.queryinheritancestub.class' => ModelBuildCommand::DEFAULT_QUERY_INHERITANCE_STUB_BUILDER,
             'propel.builder.tablemap.class'             => ModelBuildCommand::DEFAULT_TABLEMAP_BUILDER,
             'propel.builder.pluralizer.class'           => ModelBuildCommand::DEFAULT_PLURALIZER,
-            'propel.disableIdentifierQuoting'           => !false,
+            'propel.disableIdentifierQuoting'           => true,
             'propel.packageObjectModel'                 => true,
-            'propel.namespace.autoPackage'              => !false,
+            'propel.namespace.autoPackage'              => true,
             'propel.addGenericAccessors'                => true,
             'propel.addGenericMutators'                 => true,
             'propel.addSaveMethod'                      => true,
diff --git a/Command/MigrationStatusCommand.php b/Command/MigrationStatusCommand.php
index b494a53..3fc7ef8 100644
--- a/Command/MigrationStatusCommand.php
+++ b/Command/MigrationStatusCommand.php
@@ -42,7 +42,7 @@ class MigrationStatusCommand extends WrappedCommand
      */
     protected function createSubCommandInstance()
     {
-        return new \Propel\Generator\Command\MigrationStatusCommand();
+        return new BaseMigrationCommand();
     }
 
     /**
diff --git a/Command/MigrationUpCommand.php b/Command/MigrationUpCommand.php
index 43401b5..fd301c6 100644
--- a/Command/MigrationUpCommand.php
+++ b/Command/MigrationUpCommand.php
@@ -42,7 +42,7 @@ class MigrationUpCommand extends WrappedCommand
      */
     protected function createSubCommandInstance()
     {
-        return new \Propel\Generator\Command\MigrationUpCommand();
+        return new BaseMigrationCommand();
     }
 
     /**
diff --git a/Command/ModelBuildCommand.php b/Command/ModelBuildCommand.php
index d005eb7..5389000 100644
--- a/Command/ModelBuildCommand.php
+++ b/Command/ModelBuildCommand.php
@@ -14,6 +14,8 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 
+use Propel\Generator\Command\ModelBuildCommand as BaseModelBuildCommand;
+
 /**
  * @author Kévin Gomez <contact@kevingomez.fr>
  */
@@ -40,7 +42,7 @@ class ModelBuildCommand extends WrappedCommand
      */
     protected function createSubCommandInstance()
     {
-        return new \Propel\Generator\Command\ModelBuildCommand();
+        return new BaseModelBuildCommand();
     }
 
     /**
@@ -48,7 +50,7 @@ class ModelBuildCommand extends WrappedCommand
      */
     protected function getSubCommandArguments(InputInterface $input)
     {
-        $outputDir = realpath($this->getApplication()->getKernel()->getRootDir().'/../');
+        $outputDir = $this->getApplication()->getKernel()->getRootDir().'/../';
 
         return array(
             '--output-dir' => $outputDir,
diff --git a/Form/BaseAbstractType.php b/Form/BaseAbstractType.php
index 41d48f7..26aca7a 100644
--- a/Form/BaseAbstractType.php
+++ b/Form/BaseAbstractType.php
@@ -1,10 +1,21 @@
 <?php
 
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
 namespace Propel\PropelBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
+/**
+ * @author William DURAND <william.durand1@gmail.com>
+ */
 abstract class BaseAbstractType extends AbstractType
 {
     protected $options = array(
diff --git a/Tests/Fixtures/Column.php b/Tests/Fixtures/Column.php
index 510d182..385999b 100644
--- a/Tests/Fixtures/Column.php
+++ b/Tests/Fixtures/Column.php
@@ -37,13 +37,13 @@ class Column
         }
 
         switch ($this->type) {
-        case PropelColumnTypes::CHAR:
-        case PropelColumnTypes::VARCHAR:
-        case PropelColumnTypes::LONGVARCHAR:
-        case PropelColumnTypes::BLOB:
-        case PropelColumnTypes::CLOB:
-        case PropelColumnTypes::CLOB_EMU:
-            return true;
+            case PropelColumnTypes::CHAR:
+            case PropelColumnTypes::VARCHAR:
+            case PropelColumnTypes::LONGVARCHAR:
+            case PropelColumnTypes::BLOB:
+            case PropelColumnTypes::CLOB:
+            case PropelColumnTypes::CLOB_EMU:
+                return true;
         }
 
         return false;