Fixed some data issues