msvc compilation fixes.