Fix up tables