diff --git a/Library/OcAppleKernelLib/Link.c b/Library/OcAppleKernelLib/Link.c
index 8ea8c168..6cc04d9b 100644
--- a/Library/OcAppleKernelLib/Link.c
+++ b/Library/OcAppleKernelLib/Link.c
@@ -605,7 +605,7 @@ InternalCalculateTargetsIntel64 (
 
     TargetAddress = ALIGN_VALUE (
                       (Section->Address + LoadAddress),
-                      (1ULL << Section->Alignment)
+                      (1U << Section->Alignment)
                       );
     TargetAddress -= Section->Address;
   }
@@ -1593,7 +1593,7 @@ InternalPrelinkKext64 (
     while ((Section = MachoGetNextSection64 (MachoContext, Segment, Section)) != NULL) {
       Section->Address = ALIGN_VALUE (
                            (Section->Address + LoadAddress),
-                           (1ULL << Section->Alignment)
+                           (1U << Section->Alignment)
                            );
     }
 
diff --git a/Library/OcMachoLib/Symbols.c b/Library/OcMachoLib/Symbols.c
index 5686213f..82146ead 100644
--- a/Library/OcMachoLib/Symbols.c
+++ b/Library/OcMachoLib/Symbols.c
@@ -594,7 +594,7 @@ MachoRelocateSymbol64 (
 
     Value = ALIGN_VALUE (
               (Section->Address + LinkAddress),
-              (1ULL << Section->Alignment)
+              (1U << Section->Alignment)
               );
     Value -= Section->Address;
     //
diff --git a/Library/OcStringLib/OcAsciiLib.c b/Library/OcStringLib/OcAsciiLib.c
index f4e88cd5..0145f48b 100755
--- a/Library/OcStringLib/OcAsciiLib.c
+++ b/Library/OcStringLib/OcAsciiLib.c
@@ -113,7 +113,7 @@ AsciiUint64ToLowerHex (
   if (Value > 0) {
     BufferSize -= 2;
     for (Printed = FALSE, Index = MaxShifts; Index <= MaxShifts; Index -= 4) {
-      Curr     = (UINT8) ((Value >> Index) & 0xFU);
+      Curr     = (UINT8) (RShiftU64 (Value, Index) & 0xFU);
       Printed |= Curr > 0;
       if (Printed) {
         *Buffer++ = "0123456789abcdef"[Curr];