Additional fixes for data loading issues.