Fixes to email templates