diff --git a/src/app/editor/dungeon/dungeon_editor.cc b/src/app/editor/dungeon/dungeon_editor.cc
index 955f761c..6994c67c 100644
--- a/src/app/editor/dungeon/dungeon_editor.cc
+++ b/src/app/editor/dungeon/dungeon_editor.cc
@@ -70,11 +70,11 @@ absl::Status DungeonEditor::Load() {
   LoadDungeonRoomSize();
   // LoadRoomEntrances
   for (int i = 0; i < 0x07; ++i) {
-    entrances_[i] = zelda3::RoomEntrance(*rom(), i, true);
+    entrances_[i] = zelda3::RoomEntrance(rom(), i, true);
   }
 
   for (int i = 0; i < 0x85; ++i) {
-    entrances_[i + 0x07] = zelda3::RoomEntrance(*rom(), i, false);
+    entrances_[i + 0x07] = zelda3::RoomEntrance(rom(), i, false);
   }
 
   // Load the palette group and palette for the dungeon
diff --git a/src/app/editor/dungeon/dungeon_editor.h b/src/app/editor/dungeon/dungeon_editor.h
index e3cf86f1..4902d019 100644
--- a/src/app/editor/dungeon/dungeon_editor.h
+++ b/src/app/editor/dungeon/dungeon_editor.h
@@ -123,7 +123,7 @@ class DungeonEditor : public Editor {
 
   std::array<zelda3::Room, 0x128> rooms_ = {};
   std::array<zelda3::RoomEntrance, 0x8C> entrances_ = {};
-  zelda3::DungeonObjectRenderer object_renderer_;
+  // zelda3::DungeonObjectRenderer object_renderer_;
 
   absl::flat_hash_map<uint16_t, int> spriteset_usage_;
   absl::flat_hash_map<uint16_t, int> blockset_usage_;
diff --git a/src/app/editor/message/message_editor.cc b/src/app/editor/message/message_editor.cc
index dc79fe03..887ab441 100644
--- a/src/app/editor/message/message_editor.cc
+++ b/src/app/editor/message/message_editor.cc
@@ -69,7 +69,7 @@ void MessageEditor::Initialize() {
 
   current_font_gfx16_data_.reserve(kCurrentMessageWidth *
                                    kCurrentMessageHeight);
-  std::fill(current_font_gfx16_data_.begin(), current_font_gfx16_data_.end(), 
+  std::fill(current_font_gfx16_data_.begin(), current_font_gfx16_data_.end(),
             0);
 
   // 8bpp