Fixing issues with config and client.