Small refinements for the download tool