S3 client bug fixes