More fixes to data downloading.