Minor improvements in client