Forked uploader from GoAgent uploader and other small changes