Added hack to work around broken S3 api that fails when filenames have spaces in them.