Changelog entries for #236, #286 and #315