Minor tweaks for async and download