Datatable fixes