Some updates to workaround s3cmd weird issues