fixing some mapping issues with doctrine entities