Simplify path creation, fix s3 paths