Address comments from IANA.