Fixes to client