fixes to make it to compile "out of the box"
Support for Visual Studio