Fixing inconsistencies