Fix typos in templates per #1296
Merge pull request #1297 from Sophist-UK/britzke_fix_template_bugs

Fix typos in templates per #1296