S3 integration fix