Fixed more tables