diff --git a/desmume/src/utils/AsmJit/x86/x86assembler.cpp b/desmume/src/utils/AsmJit/x86/x86assembler.cpp
index 9d4ab0e53..842f6ef0f 100644
--- a/desmume/src/utils/AsmJit/x86/x86assembler.cpp
+++ b/desmume/src/utils/AsmJit/x86/x86assembler.cpp
@@ -833,10 +833,10 @@ static const _OpReg _patchedHiRegs[4] =
 {
   // Operand   |Size|Reserved0|Reserved1| OperandId    | RegisterCode          |
   // ----------+----+---------+---------+--------------+-----------------------+
-  { kOperandReg, 1, {0        ,0       }, kInvalidValue, kX86RegTypeGpbLo | 4 },
-  { kOperandReg, 1, {0        ,0       }, kInvalidValue, kX86RegTypeGpbLo | 5 },
-  { kOperandReg, 1, {0        ,0       }, kInvalidValue, kX86RegTypeGpbLo | 6 },
-  { kOperandReg, 1, {0        ,0       }, kInvalidValue, kX86RegTypeGpbLo | 7 }
+  { kOperandReg, 1, {0        ,0       }, (uint32_t) kInvalidValue, kX86RegTypeGpbLo | 4 },
+  { kOperandReg, 1, {0        ,0       }, (uint32_t) kInvalidValue, kX86RegTypeGpbLo | 5 },
+  { kOperandReg, 1, {0        ,0       }, (uint32_t) kInvalidValue, kX86RegTypeGpbLo | 6 },
+  { kOperandReg, 1, {0        ,0       }, (uint32_t) kInvalidValue, kX86RegTypeGpbLo | 7 }
 };
 
 void X86Assembler::_emitInstruction(uint32_t code)
diff --git a/desmume/src/utils/AsmJit/x86/x86compilerfunc.cpp b/desmume/src/utils/AsmJit/x86/x86compilerfunc.cpp
index c610560f2..88b4b2715 100644
--- a/desmume/src/utils/AsmJit/x86/x86compilerfunc.cpp
+++ b/desmume/src/utils/AsmJit/x86/x86compilerfunc.cpp
@@ -1227,7 +1227,6 @@ CompilerItem* X86CompilerFuncRet::translate(CompilerContext& cc)
       }
       break;
 
-    case kInvalidValue:
     default:
       break;
   }
diff --git a/desmume/src/version.cpp b/desmume/src/version.cpp
index 7c9bd0a2f..17d320687 100755
--- a/desmume/src/version.cpp
+++ b/desmume/src/version.cpp
@@ -19,7 +19,7 @@
 #include "version.h"
 
 // Helper macros to convert numerics to strings
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(__clang__)
 	//re: http://72.14.203.104/search?q=cache:HG-okth5NGkJ:mail.python.org/pipermail/python-checkins/2002-November/030704.html+_msc_ver+compiler+version+string&hl=en&gl=us&ct=clnk&cd=5
 	#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X))
 	#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X