small fixes for msvc