fixing some minor mapping issues with doctrine entities