Fixed inconsistencies.