Fix S3 lookup