Client bugs fixed.
Merge branch 'client1'