diff --git a/Platform/BootLiquor/GuiApp.c b/Platform/BootLiquor/GuiApp.c
index 9e4a9a5f..54932755 100644
--- a/Platform/BootLiquor/GuiApp.c
+++ b/Platform/BootLiquor/GuiApp.c
@@ -78,25 +78,6 @@ LoadImageFromStorage (
   return Status;
 }
 
-
-RETURN_STATUS
-LoadClickImageFromStorage (
-  IN  OC_STORAGE_CONTEXT                  *Storage,
-  IN  CONST CHAR16                        *ImageFilePath,
-  OUT GUI_CLICK_IMAGE                     *Image,
-  IN  CONST EFI_GRAPHICS_OUTPUT_BLT_PIXEL *HighlightPixel
-  )
-{
-  VOID          *ImageData;
-  UINT32        ImageSize;
-  RETURN_STATUS Status;
-  ImageData = OcStorageReadFileUnicode (Storage, ImageFilePath, &ImageSize);
-  Status  = GuiPngToClickImage (Image, ImageData, ImageSize, HighlightPixel);
-  FreePool(ImageData);
-  return Status;
-}
-
-
 RETURN_STATUS
 InternalContextConstruct (
   OUT BOOT_PICKER_GUI_CONTEXT  *Context,
diff --git a/Platform/BootLiquor/Views/BootPicker.c b/Platform/BootLiquor/Views/BootPicker.c
index b71810fa..f1caca63 100644
--- a/Platform/BootLiquor/Views/BootPicker.c
+++ b/Platform/BootLiquor/Views/BootPicker.c
@@ -817,6 +817,9 @@ BootPickerEntriesEmpty (
   ListEntry = mBootPicker.Hdr.Obj.Children.BackLink;
   ASSERT (ListEntry == &mBootPickerSelector.Hdr.Link);
 
+  //
+  // Last entry is always the selector, which is special and cannot be freed.
+  //
   ListEntry = ListEntry->BackLink;
 
   while (!IsNull (&mBootPicker.Hdr.Obj.Children, ListEntry)) {
@@ -825,10 +828,10 @@ BootPickerEntriesEmpty (
     mBootPicker.Hdr.Obj.Width   -= BOOT_ENTRY_WIDTH + BOOT_ENTRY_SPACE;
     mBootPicker.Hdr.Obj.OffsetX += (BOOT_ENTRY_WIDTH + BOOT_ENTRY_SPACE) / 2;
 
-    ListEntry = NextEntry;
-
     BootEntry = BASE_CR (ListEntry, GUI_VOLUME_ENTRY, Hdr.Link);
     InternalBootPickerEntryDestruct (BootEntry);
+
+    ListEntry = NextEntry;
   }
 }