Email and other minor fixes