Minor changes to load data.