Fixed some data bugs.