Improve AWS S3 compatibility.