porting tweaks for s3 over to s3-redux