More grid/graph fixes