ENH: VTK6 migration, misc fixes