More review changes.
Fix data loading problems.