Minor fixes to simple client