Fix Doctrine schema validation issues

These additions fix the validation issues for me.