Fixed some Doctrine incompatibilities