Fixing s3 related issues.