Triangulation fixes