Fix table number issues