S3 strategy tweaks, will break all previous S3 implementations