Fixed build for Visual Studio and in general