More download fixes