DataTable rendering fixes