Correct email bugs