Adapt default client to library improvements