Fix upload and client streaming