Some minor changes to templates