fix references for scan & tableScan