Fix windows msvc issues