Some download fixes