Fix calls to grid.xy