Fix up / refactor URLs for downloads