Some small "Table Objects" fixes
Merge pull request #1866 from ndm2/3.0-table-objects-fixes

Some small "Models > Table Objects" fixes