fix for Advanced feature
Fix build files for msvc