more tables fixes