Small fixes - email templates