templates: various nitpicks