Fix typos in templates per #1296