Fix MSVC build, sorry for commit flood