Fixed references to S3