Fixed some minor issues with templates. refs #487