Fix Changelog issues