Fixing bugs in Client