Fix some minor grid-stuff