Fixed more data errors