fix VarIterator for cmake build
cmake fix - Merge branch 'small_fixes' into develop