s3 fixes