Fix some bugs in the data