[TASK] Minor template modifications