diff --git a/MdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange64.s b/MdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange64.s
index 200e30e09e..88b9d2b490 100644
--- a/MdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange64.s
+++ b/MdePkg/Library/BaseLib/Ipf/InterlockedCompareExchange64.s
@@ -22,7 +22,7 @@
 .type   InternalSyncCompareExchange64, @function
 InternalSyncCompareExchange64::
         mov                 ar.ccv = r33
-        cmpxchg8.rel        r8  = [r64], r34
+        cmpxchg8.rel        r8  = [r32], r34
         mf
         br.ret.sptk.many    b0
 .endp   InternalSyncCompareExchange64
\ No newline at end of file
diff --git a/MdePkg/Library/BaseLib/LinkedList.c b/MdePkg/Library/BaseLib/LinkedList.c
index a1a2453fde..15ceb584db 100644
--- a/MdePkg/Library/BaseLib/LinkedList.c
+++ b/MdePkg/Library/BaseLib/LinkedList.c
@@ -34,9 +34,6 @@ IsNodeInList (
   ASSERT (Node != NULL);
 
   Count = PcdGet32 (PcdMaximumLinkedListLength);
-  if (Count != 0) {
-    Count++;
-  }
 
   Ptr = List;
   do {
diff --git a/MdePkg/Library/BaseLib/X64/DisablePaging64.asm b/MdePkg/Library/BaseLib/X64/DisablePaging64.asm
index 3134e42571..7b1e1b8bd2 100644
--- a/MdePkg/Library/BaseLib/X64/DisablePaging64.asm
+++ b/MdePkg/Library/BaseLib/X64/DisablePaging64.asm
@@ -26,7 +26,8 @@
 InternalX86DisablePaging64    PROC
     cli
     shl     rcx, 32
-    lea     ecx, @F
+    lea     eax, @F
+    mov     ecx, eax
     push    rcx
     mov     ebx, edx
     mov     esi, r8d