diff --git a/lib/print.c b/lib/print.c
index 6f2131f..8a7466c 100644
--- a/lib/print.c
+++ b/lib/print.c
@@ -1377,7 +1377,7 @@ ValueToString (
         *(p1++) = (CHAR8)r + '0';
     }
 
-    c = (Comma ? ca[(p1 - str) % 3] : 999) + 1;
+    c = (UINTN) (Comma ? ca[(p1 - str) % 3] : 999) + 1;
     while (p1 != str) {
 
         c -= 1;
diff --git a/lib/smbios.c b/lib/smbios.c
index d349fb6..23bb477 100644
--- a/lib/smbios.c
+++ b/lib/smbios.c
@@ -44,7 +44,7 @@ LibGetSmbiosSystemGuidAndSerialNumber (
     }
 
     Smbios.Hdr = (SMBIOS_HEADER *)SmbiosTable->TableAddress;
-    SmbiosEnd.Raw = (UINT8 *)(SmbiosTable->TableAddress + SmbiosTable->TableLength);
+    SmbiosEnd.Raw = (UINT8 *)((UINTN)SmbiosTable->TableAddress + SmbiosTable->TableLength);
     for (Index = 0; Index < SmbiosTable->TableLength ; Index++) {
         if (Smbios.Hdr->Type == 1) {
             if (Smbios.Hdr->Length < 0x19) {
diff --git a/lib/str.c b/lib/str.c
index 6e2e0dc..b9b156b 100644
--- a/lib/str.c
+++ b/lib/str.c
@@ -286,7 +286,7 @@ xtoi (
         }
 
         if ((c >= '0'  &&  c <= '9')  ||  (c >= 'A'  &&  c <= 'F')) {
-            u = (u << 4)  |  (c - (c >= 'A' ? 'A'-10 : '0'));
+            u = (u << 4)  |  ((UINTN)c - (c >= 'A' ? 'A'-10 : '0'));
         } else {
             break;
         }