diff --git a/FatPkg/EnhancedFatDxe/Info.c b/FatPkg/EnhancedFatDxe/Info.c
index 2ef4e9c809..740a0df5e4 100644
--- a/FatPkg/EnhancedFatDxe/Info.c
+++ b/FatPkg/EnhancedFatDxe/Info.c
@@ -172,7 +172,7 @@ Returns:
   CHAR16                            Name[FAT_NAME_LEN + 1];
   EFI_STATUS                        Status;
 
-  Size        = SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL_INFO;
+  Size        = SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL;
   Status      = FatGetVolumeEntry (Volume, Name);
   NameSize    = StrSize (Name);
   ResultSize  = Size + NameSize;
@@ -252,11 +252,11 @@ Returns:
 
 --*/
 {
-  EFI_FILE_SYSTEM_VOLUME_LABEL_INFO *Info;
+  EFI_FILE_SYSTEM_VOLUME_LABEL *Info;
 
-  Info = (EFI_FILE_SYSTEM_VOLUME_LABEL_INFO *) Buffer;
+  Info = (EFI_FILE_SYSTEM_VOLUME_LABEL *) Buffer;
 
-  if (BufferSize < SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL_INFO + 2) {
+  if (BufferSize < SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL + 2) {
     return EFI_BAD_BUFFER_SIZE;
   }
 
diff --git a/FatPkg/FatPkg.dsc b/FatPkg/FatPkg.dsc
index 16b379a084..0acaaa76a5 100644
--- a/FatPkg/FatPkg.dsc
+++ b/FatPkg/FatPkg.dsc
@@ -44,6 +44,7 @@
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
 
 [Components.common]
-  FatPkg\EnhancedFatDxe\Fat.inf
+  FatPkg/EnhancedFatDxe/Fat.inf