Fixing schema inconsistencies