Some minor changes on templates