Fix references to new grid.