some corrections related to msvc build