Fixed inconsistencies