datatable fixes