Fixes a few issues with TableView