Fix s3 store