Fix up s3package.