Fixed more data issues