diff --git a/src/asmjit/base/error.cpp b/src/asmjit/base/error.cpp
index 35c5a74..f306bc7 100644
--- a/src/asmjit/base/error.cpp
+++ b/src/asmjit/base/error.cpp
@@ -59,8 +59,8 @@ static const char* errorMessages[] = {
   "Unknown error"
 };
 
-const char* ErrorUtil::asString(Error err) {
-  return errorMessages[IntUtil::iMin<Error>(err, kErrorCount)];
+const char* ErrorUtil::asString(Error e) {
+  return errorMessages[IntUtil::iMin<Error>(e, kErrorCount)];
 }
 
 } // AsmJit
diff --git a/src/asmjit/base/globals.h b/src/asmjit/base/globals.h
index cb0d837..9dd27c3 100644
--- a/src/asmjit/base/globals.h
+++ b/src/asmjit/base/globals.h
@@ -73,11 +73,11 @@ ASMJIT_ENUM(kArch) {
 
 #if defined(ASMJIT_HOST_X86)
   kArchHost = kArchX86,
-#endif // ASMJIT_HOST
+#endif // ASMJIT_HOST_X86
 
 #if defined(ASMJIT_HOST_X64)
-  kArchHost = kArchX86,
-#endif // ASMJIT_HOST
+  kArchHost = kArchX64,
+#endif // ASMJIT_HOST_X64
 
 #if defined(ASMJIT_HOST_ARM)
   kArchHost = kArchArm,
diff --git a/src/asmjit/x86/x86assembler.cpp b/src/asmjit/x86/x86assembler.cpp
index 8c0d84f..6aac843 100644
--- a/src/asmjit/x86/x86assembler.cpp
+++ b/src/asmjit/x86/x86assembler.cpp
@@ -3143,14 +3143,15 @@ _EmitX86M:
 
   // Size override prefix.
   if (Arch == kArchX86) {
-    if (!rmMem->hasGpdBase())
+    if (rmMem->getMemType() != kMemTypeLabel && !rmMem->hasGpdBase())
       EMIT_BYTE(0x67);
   }
   else {
-    if (rmMem->hasGpdBase())
+    if (rmMem->getMemType() != kMemTypeLabel && rmMem->hasGpdBase())
       EMIT_BYTE(0x67);
   }
 
+
   // Segment override prefix.
   if (rmMem->hasSegment()) {
     EMIT_BYTE(x86SegmentPrefix[rmMem->getSegment()]);