Made email fixes