Short: Fixes Vertex <--> Wavefront problems