Fix email addresses