diff --git a/src/app/core/controller.cc b/src/app/core/controller.cc
index cec3d8df..a2dd3423 100644
--- a/src/app/core/controller.cc
+++ b/src/app/core/controller.cc
@@ -256,7 +256,7 @@ absl::Status Controller::CreateGuiContext() {
 
   // Build a new ImGui frame
   ImGui_ImplSDLRenderer2_NewFrame();
-  ImGui_ImplSDL2_NewFrame(window_.get());
+  ImGui_ImplSDL2_NewFrame();
 
   return absl::OkStatus();
 }
diff --git a/src/app/editor/dungeon_editor.cc b/src/app/editor/dungeon_editor.cc
index 0dd102ab..7a50a429 100644
--- a/src/app/editor/dungeon_editor.cc
+++ b/src/app/editor/dungeon_editor.cc
@@ -95,6 +95,7 @@ absl::Status DungeonEditor::Initialize() {
   for (int block : rooms_[current_room_id_].blocks()) {
     room_gfx_sheets_.emplace_back(graphics_bin_[block].get());
   }
+  return absl::OkStatus();
 }
 
 absl::Status DungeonEditor::RefreshGraphics() {
diff --git a/src/lib/imgui b/src/lib/imgui
index f50ddc43..3c435c02 160000
--- a/src/lib/imgui
+++ b/src/lib/imgui
@@ -1 +1 @@
-Subproject commit f50ddc431e3b8840036e88abc4c3cf74500aa12b
+Subproject commit 3c435c029788cc26c52e835e2feb262a3057addc