Minor changes to templates