Fixes for Visual Studio users. Patch by OvermindDL1 on llvm-dev!