Fixed templates. refs #418