Fixes to table executor