more template fixes
2 files changed