diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c
index 1d01ba798f..3c94c87d6f 100644
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c
@@ -67,7 +67,6 @@ ATAIdentify (
   //  use ATA PIO Data In protocol to send ATA Identify command
   //  and receive data from device
   //
-  DeviceSelect  = 0;
   DeviceSelect  = (UINT8) ((IdeDev->Device) << 4);
   Status = AtaPioDataIn (
             IdeDev,
diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c
index 93f7081516..27f7f999fa 100644
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c
@@ -1,5 +1,5 @@
 /** @file
-  Copyright (c) 2006, Intel Corporation                                                         
+  Copyright (c) 2006 - 2007, Intel Corporation                                                         
   All rights reserved. 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        
@@ -235,7 +235,6 @@ ATAPIIdentify (
   //
   // device select bit
   //
-  DeviceSelect          = 0;
   DeviceSelect          = (UINT8) ((IdeDev->Device) << 4);
 
   AtapiIdentifyPointer  = AllocatePool (sizeof (EFI_IDENTIFY_DATA));
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c
index 7654511076..47d849bd0a 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2006, Intel Corporation
+Copyright (c) 2006 - 2007, Intel Corporation
 All rights reserved. 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
@@ -636,6 +636,8 @@ WinNtGopThreadWindowProc (
     case VK_F7:   Key.ScanCode = SCAN_F7;   break;
     case VK_F8:   Key.ScanCode = SCAN_F8;   break;
     case VK_F9:   Key.ScanCode = SCAN_F9;   break;
+    case VK_F11:  Key.ScanCode = SCAN_F11;  break;
+    case VK_F12:  Key.ScanCode = SCAN_F12;  break;    
     }
 
     if (Key.ScanCode != 0) {
@@ -918,7 +920,7 @@ WinNtGopConstructor (
   Private->GraphicsOutput.Mode->Info->Version = 0;
   Private->GraphicsOutput.Mode->Info->HorizontalResolution = 0;
   Private->GraphicsOutput.Mode->Info->VerticalResolution = 0;
-  Private->GraphicsOutput.Mode->Info->PixelFormat = PixelBlueGreenRedReserved8BitPerColor;
+  Private->GraphicsOutput.Mode->Info->PixelFormat = PixelBltOnly;
   Private->GraphicsOutput.Mode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);
   Private->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;
   Private->GraphicsOutput.Mode->FrameBufferSize = 0;
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaScreen.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaScreen.c
index ed35a01c32..7d40eb7d8b 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaScreen.c
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaScreen.c
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2006, Intel Corporation                                                         
+Copyright (c) 2006 - 2007, Intel Corporation                                                         
 All rights reserved. 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        
@@ -630,6 +630,8 @@ Returns:
     case VK_F7:   Key.ScanCode = SCAN_F7;   break;
     case VK_F8:   Key.ScanCode = SCAN_F8;   break;
     case VK_F9:   Key.ScanCode = SCAN_F9;   break;
+    case VK_F11:  Key.ScanCode = SCAN_F11;  break;
+    case VK_F12:  Key.ScanCode = SCAN_F12;  break;    
     }
 
     if (Key.ScanCode != 0) {