Fix Entities