Fix up things to allow compilation with MSVC compiler

Merge request reports

Loading