Fixed up Doctrine mappings