Change s3 export code to accomodate change to S3 syntax