Fixed MSVC building issues