Fix grid geometries

/cc @hampelm