Fix some data issues.