More fixes to templates