diff --git a/src/AppGLFW.cpp b/src/AppGLFW.cpp
index 86c7a25..e5f2da0 100644
--- a/src/AppGLFW.cpp
+++ b/src/AppGLFW.cpp
@@ -124,10 +124,8 @@ int pixelarium::ui::AppGLFW::Run()
 
         if (ImGui::BeginListBox("ListBox"))
         {
-            pool_.EnumerateResources([](size_t id, const imaging::PixelariumImage& img) -> void
-            {
-                ImGui::Selectable(std::format("Image {}", id).c_str());
-            });
+            pool_.EnumerateResources([](size_t id, const imaging::PixelariumImage&) -> void
+                                     { ImGui::Selectable(std::format("Image {}", id).c_str()); });
 
             ImGui::EndListBox();
         }
@@ -203,11 +201,12 @@ void pixelarium::ui::AppGLFW::MenuBar()
 
 void pixelarium::ui::AppGLFW::LoadImageProt()
 {
+    size_t last_id{};
     auto res{pfd::open_file("Load Inputs", pfd::path::home(), {"All Files", "*"}, pfd::opt::multiselect).result()};
     for (auto& p : res)
     {
         this->logger_.Debug(std::format("{}: Creating image {}", __FUNCTION__, p));
 
-        image_view_model_->AddImage(std::make_unique<PixelariumImage>(p));
+        last_id = image_view_model_->AddImage(std::make_unique<PixelariumImage>(p));
     }
 }
diff --git a/tests/lib/resources/test_resource.cpp b/tests/lib/resources/test_resource.cpp
index 76e9a6a..4cbf38d 100644
--- a/tests/lib/resources/test_resource.cpp
+++ b/tests/lib/resources/test_resource.cpp
@@ -82,9 +82,7 @@ TEST(ImageResourcePoolTest, EnumerateResources)
     auto id2 = pool.SetResource(std::make_unique<DummyImage>());
     std::vector<size_t> found_ids{};
 
-    std::function<void(size_t, const pixelarium::imaging::PixelariumImage&)> func =
-        [&found_ids](size_t id, const pixelarium::imaging::PixelariumImage&) { found_ids.push_back(id); };
-    pool.EnumerateResources(func);
+    pool.EnumerateResources([&found_ids](size_t id, const pixelarium::imaging::PixelariumImage&) { found_ids.push_back(id); });
 
     EXPECT_EQ(found_ids.size(), 2);
     EXPECT_NE(std::find(found_ids.begin(), found_ids.end(), id1), found_ids.end());
@@ -98,7 +96,7 @@ TEST(ImageResourcePoolTest, TemplatedEnumerate)
     auto id2 = pool.SetResource(std::make_unique<DummyImage>());
     std::vector<size_t> found_ids{};
 
-    pool.Enumerate([&found_ids](size_t id, const pixelarium::imaging::PixelariumImage& img) { found_ids.push_back(id); });
+    pool.Enumerate([&found_ids](size_t id, const pixelarium::imaging::PixelariumImage&) { found_ids.push_back(id); });
 
     EXPECT_EQ(found_ids.size(), 2);
     EXPECT_NE(std::find(found_ids.begin(), found_ids.end(), id1), found_ids.end());