Fix data loading problems.