Next fixes for MSVC.