Slight change to some templates