Update CHANGELOG.md

Re-ordered bug fixes.