Latest fixes for s3up.