Fixed s3 calls.