Fixed some data table stuff