Merge fixes

Refer to CHANGELOG.md for changelog ;)