Fixes for the table only view.