fixing various inconsistencies