Fixed some errors in templetes