Bug fixes in shear grid iteration