Bug fixes
Doctrine legacy methods fix