Small additional changes to templates