Fixing issues with email templates.