More vertex order fixes for 2D output