diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index bcce412a33..4ac12a4e1e 100644
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -327,7 +327,7 @@ Returns:
     return EFI_INVALID_PARAMETER;
   }
   
-  gWinNt->QueryPerformanceCounter (TimerValue);
+  gWinNt->QueryPerformanceCounter ((LARGE_INTEGER *)TimerValue);
   
   if (TimerPeriod != NULL) {
     *TimerPeriod = mTimerPeriod;
@@ -532,7 +532,7 @@ Returns:
   //
   // Retrieve the frequency of the performance counter in Hz.
   //  
-  gWinNt->QueryPerformanceFrequency (&Frequency);
+  gWinNt->QueryPerformanceFrequency ((LARGE_INTEGER *)&Frequency);
   
   //
   // Convert frequency in Hz to a clock period in femtoseconds.
diff --git a/Nt32Pkg/Sec/SecMain.inf b/Nt32Pkg/Sec/SecMain.inf
index 90597c2dfc..cfb7921f42 100644
--- a/Nt32Pkg/Sec/SecMain.inf
+++ b/Nt32Pkg/Sec/SecMain.inf
@@ -3,7 +3,7 @@
 #
 # Main executable file of NT32 Emulator that loads PEI core after initialization finished.
 #
-#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution. The full text of the license may be found at
@@ -63,13 +63,13 @@
   
 [BuildOptions]
   MSFT:*_*_IA32_DLINK_FLAGS == /out:"$(BIN_DIR)\SecMain.exe" /base:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"$(VCINSTALLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib
-  MSFT:*_*_IA32_CC_FLAGS == /nologo /W4 /WX /Gy /c /D UNICODE /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
-  MSFT:*_*_IA32_PP_FLAGS == /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
+  MSFT:*_*_IA32_CC_FLAGS == /nologo /W4 /WX /Gy /c /D UNICODE /Od /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
+  MSFT:*_*_IA32_PP_FLAGS == /nologo /E /TC /FIAutoGen.h
   MSFT:*_*_IA32_ASM_FLAGS == /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi
   MSFT:*_*_IA32_ASMLINK_FLAGS       == /link /nologo /tiny
 
   INTEL:*_*_IA32_DLINK_FLAGS == /out:"$(BIN_DIR)\SecMain.exe" /base:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"C:\Program Files\Intel\Compiler\C++\9.1\IA32\Lib" /LIBPATH:"$(VCINSTALLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib
-  INTEL:*_*_IA32_CC_FLAGS == /nologo /W4 /WX /Gy /c /D UNICODE /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
-  INTEL:*_*_IA32_PP_FLAGS == /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h
+  INTEL:*_*_IA32_CC_FLAGS == /nologo /W4 /WX /Gy /c /D UNICODE /Od /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
+  INTEL:*_*_IA32_PP_FLAGS == /nologo /E /TC /FIAutoGen.h
   INTEL:*_*_IA32_ASM_FLAGS == /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi
   INTEL:*_*_IA32_ASMLINK_FLAGS       == /link /nologo /tiny
diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c b/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
index 3b91da8f9f..5defc1601c 100644
--- a/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
@@ -246,12 +246,14 @@ Returns:
 
 VOID
 WinNtGopSimpleTextInTimerHandler (
-  IN EFI_EVENT          Event,
-  IN GOP_PRIVATE_DATA   *Private
+  IN EFI_EVENT  Event,
+  IN VOID       *Context
   )
 {
-  EFI_KEY_DATA          KeyData;
+  GOP_PRIVATE_DATA  *Private;
+  EFI_KEY_DATA      KeyData;
 
+  Private = (GOP_PRIVATE_DATA *)Context;
   while (GopPrivateDeleteQ (Private, &Private->QueueForNotify, &KeyData) == EFI_SUCCESS) {
     GopPrivateInvokeRegisteredFunction (Private, &KeyData);
   }
@@ -330,9 +332,9 @@ GopPrivateAddKey (
       (KeyData.Key.UnicodeChar >= 1) && (KeyData.Key.UnicodeChar <= 26)
      ) {
     if ((Private->LeftShift || Private->RightShift) == Private->CapsLock) {
-      KeyData.Key.UnicodeChar = KeyData.Key.UnicodeChar + L'a' - 1;
+      KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar + L'a' - 1);
     } else {
-      KeyData.Key.UnicodeChar = KeyData.Key.UnicodeChar + L'A' - 1;
+      KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar + L'A' - 1);
     }
   }
 
@@ -352,9 +354,9 @@ GopPrivateAddKey (
   //
   if (Private->LeftCtrl || Private->RightCtrl) {
     if ((KeyData.Key.UnicodeChar >= L'a') && (KeyData.Key.UnicodeChar <= L'z')) {
-      KeyData.Key.UnicodeChar = KeyData.Key.UnicodeChar - L'a' + 1;
+      KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar - L'a' + 1);
     } else if ((KeyData.Key.UnicodeChar >= L'A') && (KeyData.Key.UnicodeChar <= L'Z')) {
-      KeyData.Key.UnicodeChar = KeyData.Key.UnicodeChar - L'A' + 1;
+      KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar - L'A' + 1);
     }
   }
   GopPrivateAddQ (Private, &Private->QueueForRead, &KeyData);