Fix class table bugs