diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
index f249ac29a..2903ac96f 100644
--- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
+++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
@@ -844,8 +844,8 @@ class BasicEntityPersister
         }
 
         return 'SELECT ' . $this->_getSelectColumnListSQL() 
-             . ' FROM ' . $this->_class->getQuotedTableName($this->_platform) . ' '
-             . $this->_getSQLTableAlias($this->_class->name)
+             . $this->_platform->appendLockHint(' FROM ' . $this->_class->getQuotedTableName($this->_platform) . ' '
+             . $this->_getSQLTableAlias($this->_class->name), $lockMode)
              . $joinSql
              . ($conditionSql ? ' WHERE ' . $conditionSql : '')
              . $orderBySql 
@@ -1082,7 +1082,7 @@ class BasicEntityPersister
         }
 
         $sql = 'SELECT 1 '
-             . $this->getLockTablesSql()
+             . $this->_platform->appendLockHint($this->getLockTablesSql(), $lockMode)
              . ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ' . $lockSql;
         $params = array_values($criteria);
         $this->_conn->executeQuery($sql, $params);
diff --git a/lib/Doctrine/ORM/Query/AST/Functions/LengthFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/LengthFunction.php
index fc779e4f7..36787786d 100644
--- a/lib/Doctrine/ORM/Query/AST/Functions/LengthFunction.php
+++ b/lib/Doctrine/ORM/Query/AST/Functions/LengthFunction.php
@@ -41,8 +41,9 @@ class LengthFunction extends FunctionNode
      */
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        //TODO: Use platform to get SQL
-        return 'LENGTH(' . $sqlWalker->walkStringPrimary($this->stringPrimary) . ')';
+        return $sqlWalker->getConnection()->getDatabasePlatform()->getLengthExpression(
+               $sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary)
+        );
     }
 
     /**
diff --git a/lib/Doctrine/ORM/Query/AST/Functions/LowerFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/LowerFunction.php
index b5d33face..775f51d9a 100644
--- a/lib/Doctrine/ORM/Query/AST/Functions/LowerFunction.php
+++ b/lib/Doctrine/ORM/Query/AST/Functions/LowerFunction.php
@@ -41,8 +41,9 @@ class LowerFunction extends FunctionNode
      */
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        //TODO: Use platform to get SQL
-        return 'LOWER(' . $sqlWalker->walkStringPrimary($this->stringPrimary) . ')';
+        return $sqlWalker->getConnection()->getDatabasePlatform()->getLowerExpression(
+               $sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary)
+        );
     }
 
     /**
diff --git a/lib/Doctrine/ORM/Query/AST/Functions/ModFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/ModFunction.php
index 7c52d60b8..4d124fe85 100644
--- a/lib/Doctrine/ORM/Query/AST/Functions/ModFunction.php
+++ b/lib/Doctrine/ORM/Query/AST/Functions/ModFunction.php
@@ -42,12 +42,10 @@ class ModFunction extends FunctionNode
      */
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        //TODO: Use platform to get SQL
-        return 'MOD(' 
-             . $sqlWalker->walkSimpleArithmeticExpression($this->firstSimpleArithmeticExpression)
-             . ', ' 
-             . $sqlWalker->walkSimpleArithmeticExpression($this->secondSimpleArithmeticExpression) 
-             . ')';
+        return $sqlWalker->getConnection()->getDatabasePlatform()->getModExpression(
+               $sqlWalker->walkSimpleArithmeticExpression($this->firstSimpleArithmeticExpression),
+               $sqlWalker->walkSimpleArithmeticExpression($this->secondSimpleArithmeticExpression)
+        );
     }
 
     /**
diff --git a/lib/Doctrine/ORM/Query/AST/Functions/UpperFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/UpperFunction.php
index ff2b1e30b..acc8dd8eb 100644
--- a/lib/Doctrine/ORM/Query/AST/Functions/UpperFunction.php
+++ b/lib/Doctrine/ORM/Query/AST/Functions/UpperFunction.php
@@ -41,8 +41,9 @@ class UpperFunction extends FunctionNode
      */
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        //TODO: Use platform to get SQL
-        return 'UPPER(' . $sqlWalker->walkStringPrimary($this->stringPrimary) . ')';
+        return $sqlWalker->getConnection()->getDatabasePlatform()->getUpperExpression(
+               $sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary)
+        );
     }
 
     /**
diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php
index 540745d8a..76685c2b7 100644
--- a/lib/Doctrine/ORM/Tools/SchemaTool.php
+++ b/lib/Doctrine/ORM/Tools/SchemaTool.php
@@ -185,6 +185,8 @@ class SchemaTool
                     $idMapping = $class->fieldMappings[$class->identifier[0]];
                     $this->_gatherColumn($class, $idMapping, $table);
                     $columnName = $class->getQuotedColumnName($class->identifier[0], $this->_platform);
+                    // TODO: This seems rather hackish, can we optimize it?
+                    $table->getColumn($class->identifier[0])->setAutoincrement(false);
 
                     $pkColumns[] = $columnName;
                     // TODO: REMOVE
diff --git a/tests/Doctrine/Tests/Models/DirectoryTree/File.php b/tests/Doctrine/Tests/Models/DirectoryTree/File.php
index c43f2c82f..35132689a 100644
--- a/tests/Doctrine/Tests/Models/DirectoryTree/File.php
+++ b/tests/Doctrine/Tests/Models/DirectoryTree/File.php
@@ -43,4 +43,4 @@ class File extends AbstractContentItem
     {
         $this->extension = $ext;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php
index 8ab65d8c6..3b0734998 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php
@@ -66,7 +66,6 @@ class DDC809Variant
     /**
      * @Column(name="variant_id", type="integer")
      * @Id
-     * @GeneratedValue(strategy="AUTO")
      */
     protected $variantId;
 
@@ -98,7 +97,6 @@ class DDC809SpecificationValue
     /**
      * @Column(name="specification_value_id", type="integer")
      * @Id
-     * @GeneratedValue(strategy="AUTO")
      */
     protected $specificationValueId;
 
diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
index 55674a213..94c41c50d 100644
--- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
@@ -874,4 +874,4 @@ class MyAbsFunction extends \Doctrine\ORM\Query\AST\Functions\FunctionNode
         
         $parser->match(\Doctrine\ORM\Query\Lexer::T_CLOSE_PARENTHESIS);
     }
-}
\ No newline at end of file
+}