Fix Email addresses