diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.c
index 005e0596b6..bb272cc8de 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciUrb.c
@@ -294,7 +294,7 @@ EhcConvertPollRate (
     BitCount++;
   }
 
-  return 1 << (BitCount - 1);
+  return (UINTN)1 << (BitCount - 1);
 }
 
 
diff --git a/MdeModulePkg/Universal/EbcDxe/x64/EbcLowLevel.asm b/MdeModulePkg/Universal/EbcDxe/x64/EbcLowLevel.asm
index 7b59e93aa1..3262ea9378 100644
--- a/MdeModulePkg/Universal/EbcDxe/x64/EbcLowLevel.asm
+++ b/MdeModulePkg/Universal/EbcDxe/x64/EbcLowLevel.asm
@@ -53,7 +53,7 @@ text SEGMENT
 CopyMem  PROTO  Destination:PTR DWORD, Source:PTR DWORD, Count:DWORD
 
 
-EbcLLCALLEXNative        PROC    NEAR    PUBLIC
+EbcLLCALLEXNative        PROC    PUBLIC
       push   rbp
       push   rbx
       mov    rbp, rsp
@@ -101,7 +101,7 @@ EbcLLCALLEXNative    ENDP
 ; Returns:
 ;     The contents of the register in which the entry point is passed.
 ;
-EbcLLGetEbcEntryPoint        PROC    NEAR    PUBLIC
+EbcLLGetEbcEntryPoint        PROC    PUBLIC
     ret
 EbcLLGetEbcEntryPoint    ENDP
 
@@ -124,7 +124,7 @@ EbcLLGetEbcEntryPoint    ENDP
 ;--*/
 
 ; UINTN EbcLLGetStackPointer()            
-EbcLLGetStackPointer        PROC    NEAR    PUBLIC
+EbcLLGetStackPointer        PROC    PUBLIC
     mov    rax, rsp      ; get current stack pointer
     ; Stack adjusted by this much when we were called,
     ; For this function, it's 4.
@@ -145,7 +145,7 @@ EbcLLGetStackPointer    ENDP
 ; Returns:
 ;     The unmodified value returned by the native code.
 ;
-EbcLLGetReturnValue   PROC    NEAR    PUBLIC
+EbcLLGetReturnValue   PROC    PUBLIC
     ret
 EbcLLGetReturnValue    ENDP