Small fixes to VTK output and cmake build system