Fix some data issues