Fixes to template via email from @ivan-basekit