Fixes to Client