Fixed More Tables

Fixed more tables this update.