More table fixes