Fix issues in the client.