Fixes to client.