COMP: More VTK 6 changes