n/a: [Templates] - fix template errors