grid2d fixes