Make some changes related to ITK and VTK version