Some table fixups.