minor fixes to support the new data loading capabilities