fixes for msvc build