Fixes for client to nicely handle upload.