More fixes for MSVC
More fixes for MSVC