First fixes for msvc