a few adjustments for Visual Studio analysis (nw)