Changelog and build fix