Fixes for email delivery