Improving support for non-standard s3 clients.