Fixes for windows and parsing of msvc