Fixed some templates
0.4.1