Some small amendments for MSVC.