More Table fixups.