diff --git a/generator/lib/builder/om/QueryBuilder.php b/generator/lib/builder/om/QueryBuilder.php
index 7875f5bb7..104b0805f 100644
--- a/generator/lib/builder/om/QueryBuilder.php
+++ b/generator/lib/builder/om/QueryBuilder.php
@@ -1282,12 +1282,12 @@ protected function addFilterByCrossFK(&$script, $refFK, $crossFK)
      * Filter the query by a related $fkPhpName object
      * using the $crossTableName table as cross reference
      *
-     * @param   $fkPhpName $objectName the related object to use as filter
+     * @param   $fkPhpName|PropelObjectCollection $objectName the related object to use as filter
      * @param     string \$comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @return   $queryClass The current query, for fluid interface
      */
-    public function filterBy{$relName}($objectName, \$comparison = Criteria::EQUAL)
+    public function filterBy{$relName}($objectName, \$comparison = null)
     {
         return \$this
             ->use{$relationName}Query()
diff --git a/generator/lib/model/ScopedElement.php b/generator/lib/model/ScopedElement.php
index bca8cb542..b5c661f24 100644
--- a/generator/lib/model/ScopedElement.php
+++ b/generator/lib/model/ScopedElement.php
@@ -68,7 +68,7 @@ protected function setupObject()
     /**
      * Get the value of the namespace.
      *
-     * @return value of namespace.
+     * @return string
      */
     public function getNamespace()
     {
@@ -95,7 +95,7 @@ public function setNamespace($v)
     /**
      * Get the value of package.
      *
-     * @return value of package.
+     * @return string
      */
     public function getPackage()
     {
@@ -119,7 +119,7 @@ public function setPackage($v)
     /**
      * Get the value of schema.
      *
-     * @return value of schema.
+     * @return string
      */
     public function getSchema()
     {