Fixes to S3 and File outputs
1.0b8