diff --git a/lib/Doctrine/ORM/Persisters/AbstractEntityPersister.php b/lib/Doctrine/ORM/Persisters/AbstractEntityPersister.php
index 813d724a8..a5e03b732 100644
--- a/lib/Doctrine/ORM/Persisters/AbstractEntityPersister.php
+++ b/lib/Doctrine/ORM/Persisters/AbstractEntityPersister.php
@@ -35,7 +35,7 @@ use Doctrine\ORM\Mapping\ClassMetadata;
  * @link        www.doctrine-project.org
  * @since       2.0
  */
-abstract class AbstractEntityPersister
+class AbstractEntityPersister
 {    
     /**
      * Metadata object that describes the mapping of the mapped entity class.
diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php
index 5c6d0dcd4..9975f653d 100644
--- a/lib/Doctrine/ORM/Query/SqlWalker.php
+++ b/lib/Doctrine/ORM/Query/SqlWalker.php
@@ -1042,7 +1042,8 @@ class SqlWalker
             }
 
             if (isset($class->associationMappings[$fieldName])) {
-                //FIXME: Composite key support, inverse side support
+                //FIXME: Inverse side support
+                //FIXME: Throw exception on composite key
                 $sql .= $class->associationMappings[$fieldName]->joinColumns[0]['name'];
             } else {
                 $sql .= $class->getColumnName($fieldName);
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
index e888b4c6f..a7763d2d3 100644
--- a/lib/Doctrine/ORM/UnitOfWork.php
+++ b/lib/Doctrine/ORM/UnitOfWork.php
@@ -1476,7 +1476,7 @@ class UnitOfWork implements PropertyChangedListener
         if ( ! isset($this->_persisters[$entityName])) {
             $class = $this->_em->getClassMetadata($entityName);
             if ($class->isInheritanceTypeNone()) {
-                $persister = new Persisters\StandardEntityPersister($this->_em, $class);
+                $persister = new Persisters\AbstractEntityPersister($this->_em, $class);
             } else if ($class->isInheritanceTypeSingleTable()) {
                 $persister = new Persisters\SingleTablePersister($this->_em, $class);
             } else if ($class->isInheritanceTypeJoined()) {