Add changelog entry for #275 and #276