Tweaks to RFC822 Names and ISO classs