Fixed some templates