Upgrade/fix s3 storage wrapper.