Updates to improve handling of upload jobs.