Some table fixes