fixes in TableDatasourceAndDelegate