Some fixes to simple client