some tweaks to tbs_client