Fixes to support trading multiple client accounts