more tablescan fixes