Several table fixes