changelog and inconsistency fix