More table fixups.