VTK 6.1 fixes