Fix uploading edge cases

/cc @opscode/release-engineers