Add changeslog entry, fix 2 minor things