Correct MSVC compiler errors