More fixes to data