Fixup tables a bit