more template syntax fixes
more template syntax fixes