s3 tweaks
Merge branch 's3-static'