Some fixes to s3 wrangling.