Fix up data loading issues.