Fixing entities.