MSVC compatible changes; successful build.