diff --git a/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c b/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
index 5889586cee..41db3c288d 100644
--- a/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
+++ b/UnixPkg/FvbServicesRuntimeDxe/FWBlockService.c
@@ -230,7 +230,7 @@ Returns:
 EFI_STATUS
 FvbGetVolumeAttributes (
   IN UINTN                                Instance,
-  OUT EFI_FVB_ATTRIBUTES                  *Attributes,
+  OUT EFI_FVB_ATTRIBUTES_2                  *Attributes,
   IN ESAL_FWB_GLOBAL                      *Global,
   IN BOOLEAN                              Virtual
   )
@@ -401,7 +401,7 @@ Returns:
 
 --*/
 {
-  EFI_FVB_ATTRIBUTES  Attributes;
+  EFI_FVB_ATTRIBUTES_2  Attributes;
   UINTN               LbaAddress;
   UINTN               LbaLength;
   EFI_STATUS          Status;
@@ -486,7 +486,7 @@ Returns:
 
 --*/
 {
-  EFI_FVB_ATTRIBUTES  Attributes;
+  EFI_FVB_ATTRIBUTES_2  Attributes;
   UINTN               LbaAddress;
   UINTN               LbaLength;
   EFI_STATUS          Status;
@@ -563,7 +563,7 @@ Returns:
 --*/
 {
 
-  EFI_FVB_ATTRIBUTES  Attributes;
+  EFI_FVB_ATTRIBUTES_2  Attributes;
   UINTN               LbaAddress;
   UINTN               LbaLength;
   EFI_STATUS          Status;
@@ -707,7 +707,7 @@ Returns:
 EFI_STATUS
 FvbSetVolumeAttributes (
   IN UINTN                                Instance,
-  IN OUT EFI_FVB_ATTRIBUTES               *Attributes,
+  IN OUT EFI_FVB_ATTRIBUTES_2               *Attributes,
   IN ESAL_FWB_GLOBAL                      *Global,
   IN BOOLEAN                              Virtual
   )
@@ -720,7 +720,7 @@ Routine Description:
 Arguments:
   Instance              - The FV instance whose attributes is going to be 
                           modified
-  Attributes            - On input, it is a pointer to EFI_FVB_ATTRIBUTES 
+  Attributes            - On input, it is a pointer to EFI_FVB_ATTRIBUTES_2 
                           containing the desired firmware volume settings.
                           On successful return, it contains the new settings
                           of the firmware volume
@@ -738,13 +738,13 @@ Returns:
 --*/
 {
   EFI_FW_VOL_INSTANCE *FwhInstance;
-  EFI_FVB_ATTRIBUTES  OldAttributes;
-  EFI_FVB_ATTRIBUTES  *AttribPtr;
+  EFI_FVB_ATTRIBUTES_2  OldAttributes;
+  EFI_FVB_ATTRIBUTES_2  *AttribPtr;
   UINT32              Capabilities;
   UINT32              OldStatus;
   UINT32              NewStatus;
   EFI_STATUS          Status;
-  EFI_FVB_ATTRIBUTES  UnchangedAttributes;
+  EFI_FVB_ATTRIBUTES_2  UnchangedAttributes;
 
 
   //
@@ -753,7 +753,7 @@ Returns:
   Status = GetFvbInstance (Instance, Global, &FwhInstance, Virtual);
   ASSERT_EFI_ERROR (Status);
 
-  AttribPtr     = (EFI_FVB_ATTRIBUTES *) &(FwhInstance->VolumeHeader.Attributes);
+  AttribPtr     = (EFI_FVB_ATTRIBUTES_2 *) &(FwhInstance->VolumeHeader.Attributes);
   OldAttributes = *AttribPtr;
   Capabilities  = OldAttributes & (EFI_FVB2_READ_DISABLED_CAP | \
                                    EFI_FVB2_READ_ENABLED_CAP | \
@@ -920,7 +920,7 @@ EFI_STATUS
 EFIAPI
 FvbProtocolGetAttributes (
   IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
-  OUT EFI_FVB_ATTRIBUTES                          *Attributes
+  OUT EFI_FVB_ATTRIBUTES_2                          *Attributes
   )
 /*++
 
@@ -947,7 +947,7 @@ EFI_STATUS
 EFIAPI
 FvbProtocolSetAttributes (
   IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
-  IN OUT EFI_FVB_ATTRIBUTES                       *Attributes
+  IN OUT EFI_FVB_ATTRIBUTES_2                       *Attributes
   )
 /*++
 
diff --git a/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h b/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h
index 6f949d37ec..f005f39c01 100644
--- a/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h
+++ b/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h
@@ -104,7 +104,7 @@ FvbEraseBlock (
 EFI_STATUS
 FvbSetVolumeAttributes (
   IN UINTN                                Instance,
-  IN OUT EFI_FVB_ATTRIBUTES               *Attributes,
+  IN OUT EFI_FVB_ATTRIBUTES_2               *Attributes,
   IN ESAL_FWB_GLOBAL                      *Global,
   IN BOOLEAN                              Virtual
   )
@@ -113,7 +113,7 @@ FvbSetVolumeAttributes (
 EFI_STATUS
 FvbGetVolumeAttributes (
   IN UINTN                                Instance,
-  OUT EFI_FVB_ATTRIBUTES                  *Attributes,
+  OUT EFI_FVB_ATTRIBUTES_2                  *Attributes,
   IN ESAL_FWB_GLOBAL                      *Global,
   IN BOOLEAN                              Virtual
   )
@@ -164,7 +164,7 @@ EFI_STATUS
 EFIAPI
 FvbProtocolGetAttributes (
   IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
-  OUT EFI_FVB_ATTRIBUTES                          *Attributes
+  OUT EFI_FVB_ATTRIBUTES_2                          *Attributes
   )
 ;
 
@@ -172,7 +172,7 @@ EFI_STATUS
 EFIAPI
 FvbProtocolSetAttributes (
   IN EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL           *This,
-  IN OUT EFI_FVB_ATTRIBUTES                       *Attributes
+  IN OUT EFI_FVB_ATTRIBUTES_2                       *Attributes
   )
 ;
 
diff --git a/UnixPkg/UnixPkg.dsc b/UnixPkg/UnixPkg.dsc
index dd657d4749..0ca6b95db7 100644
--- a/UnixPkg/UnixPkg.dsc
+++ b/UnixPkg/UnixPkg.dsc
@@ -181,6 +181,10 @@
   UnixLib|UnixPkg/Library/DxeUnixLib/DxeUnixLib.inf
   OemHookStatusCodeLib|UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
   DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
+  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
+  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
+  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
 
 [LibraryClasses.common.DXE_DRIVER]
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index b662fd8861..aca7a3ab0e 100644
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -152,8 +152,8 @@ APRIORI PEI {
   INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
   }
 APRIORI DXE {
-  INF  IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+  INF  IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
   INF  UnixPkg/MetronomeDxe/Metronome.inf
   }
 INF  MdeModulePkg/Core/Pei/PeiMain.inf