MSVC: Fix issues so cmake build works.