More small fixing download/hadd now seems to work