Address issues from Magnu's e-mail.
ToDO: Address changes from last IETF meeting.