TableView: some more minor workaround