More e-mail address fixes