Get rid of inconsistencies