Put geom checks after adjust for non-multi also