A few fixes during pre-PR review
CHANGES_NEXT_RELEASE was already updated ...