Handle a few more metadata cases, nicen the uploading experience a bit more