Fix Uploader creating too many threads