Fix CHANGES hiccups