More fixes for data loading