Fixes to client
More fixes to client