Small bugfix + use latest adjustment in Doctrine\ORM