Fixes in client