Fix a few minor issues found while getting changelog