Fixed Table Bugs