core: tweaks to make all the modules use the same dl source and have some uniformity.