more table fixes