Misc improvements to support uploading blobs