Additional changes so email templates conform to v2 specifications.