fix invalid templates

It looks like there are some missing components in the templates from release-1.