Fixup the changelog script and update CHANGES.md