a few changes required to get the tests for s3 to run.