Fix downloader for cli and gui