Fix issues found in client.