Fixed issues in client