client tpl fixes
client tpl fixes 2