Additional download fixes