Fixing S3 storage