Fix AWS S3 image problems.