Fixed all the tables