Change changelog and fix edge case.