Minor fixes in tpl type deduction