Fixed some templates' type