Fix up s3 stuff.