Small fixes in grid