B: check fixes for uploading