More fixes to template code