Fixed some default template elements