Cleanups needed to keep VTK5 compatibility