Prelim changes for Visual Studio plugin, to support trouble shooting