MSVC compiler support
Fix conflicts after merge