fixes to Client