Minor changes for MSVC.