Fix compilation for Clang & MSVC
5 files changed