email fixes