Bug fixes to table method