Fix a few more issues with the email