Minor fix
Add support for transport client