Fix up email a bit