Improving consistency between DownloadHandlers