Fixed some templetes.