A few more data fixes