misc updates related to msvc harmonization