COMP: Fixes to accomodate VTK module import problems