Fix compile errors under Clang 3.6 for MSVC