Minor updates to templates