diff --git a/LICENSE.md b/LICENSE.md
index 7742e92..3660760 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,5 +1,5 @@
 AsmJit - Complete x86/x64 JIT and Remote Assembler for C++  
-Copyright (c) 2008-2014, Petr Kobalicek <kobalicek.petr@gmail.com>
+Copyright (c) 2008-2015, Petr Kobalicek <kobalicek.petr@gmail.com>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
diff --git a/src/asmjit/base/compiler.h b/src/asmjit/base/compiler.h
index 34fcb71..c5be74a 100644
--- a/src/asmjit/base/compiler.h
+++ b/src/asmjit/base/compiler.h
@@ -1206,10 +1206,12 @@ ASMJIT_TYPE_ID(Int8Type     , kVarTypeInt8);
 ASMJIT_TYPE_ID(UInt8Type    , kVarTypeUInt8);
 ASMJIT_TYPE_ID(Int16Type    , kVarTypeInt16);
 ASMJIT_TYPE_ID(UInt16Type   , kVarTypeUInt16);
-ASMJIT_TYPE_ID(Int32Type    , kVarTypeUInt32);
+ASMJIT_TYPE_ID(Int32Type    , kVarTypeInt32);
 ASMJIT_TYPE_ID(UInt32Type   , kVarTypeUInt32);
-ASMJIT_TYPE_ID(Int64Type    , kVarTypeUInt64);
+ASMJIT_TYPE_ID(Int64Type    , kVarTypeInt64);
 ASMJIT_TYPE_ID(UInt64Type   , kVarTypeUInt64);
+ASMJIT_TYPE_ID(IntPtrType   , kVarTypeIntPtr);
+ASMJIT_TYPE_ID(UIntPtrType  , kVarTypeUIntPtr);
 ASMJIT_TYPE_ID(FloatType    , kVarTypeFp32);
 ASMJIT_TYPE_ID(DoubleType   , kVarTypeFp64);
 #endif // !ASMJIT_DOCGEN
diff --git a/src/asmjit/x86/x86operand.h b/src/asmjit/x86/x86operand.h
index d1b9ec9..7e6929a 100644
--- a/src/asmjit/x86/x86operand.h
+++ b/src/asmjit/x86/x86operand.h
@@ -1620,7 +1620,7 @@ namespace x86 {
   static const _Type_& _Name_ = x86RegData._Field_
 
 ASMJIT_DEF_REG(X86RipReg, rip, rip);        //!< RIP register.
-ASMJIT_DEF_REG(X86GpReg , noGpReg, noGp);   //!< No GP register (for `X86Mem` operand.).
+ASMJIT_DEF_REG(X86GpReg , noGpReg, noGp);   //!< No GP register (for `X86Mem` operand).
 
 ASMJIT_DEF_REG(X86SegReg, es   , seg[1]);   //!< Cs segment register.
 ASMJIT_DEF_REG(X86SegReg, cs   , seg[2]);   //!< Ss segment register.