Changes and fixes to client