Small changes to client.