Fix build and update CHANGELOG