Additional download handler tweaks