Improved support for Visual Studio 2015