templates - minor changes