Some minor fixes for eval-table