Fixing issues with client.