And more e-mail address fixes