Fixing model inconsistencies