Template

fix template variable deprecation warnings