More VTK 6 fixes