Fixed: Datatable issues
Small fixes