Some changes for uploading builds
Some more uploading fixes