diff --git a/YAZE.vcxproj b/YAZE.vcxproj
index 1bcd5105..e35b4c52 100644
--- a/YAZE.vcxproj
+++ b/YAZE.vcxproj
@@ -813,9 +813,6 @@
     <ClCompile Include="src\app\editor\system\shortcut_manager.cc">
       <Filter>App\Editor\System</Filter>
     </ClCompile>
-    <ClCompile Include="src\app\editor\system\system_editor.cc">
-      <Filter>App\Editor\System</Filter>
-    </ClCompile>
     <ClCompile Include="src\app\editor\code\assembly_editor.cc">
       <Filter>App\Editor\Code</Filter>
     </ClCompile>
diff --git a/YAZE.vcxproj.filters b/YAZE.vcxproj.filters
index 2145b0f2..07ad64d2 100644
--- a/YAZE.vcxproj.filters
+++ b/YAZE.vcxproj.filters
@@ -280,9 +280,6 @@
     <ClInclude Include="src\app\editor\system\shortcut_manager.h">
       <Filter>App\Editor\System</Filter>
     </ClInclude>
-    <ClInclude Include="src\app\editor\system\system_editor.h">
-      <Filter>App\Editor\System</Filter>
-    </ClInclude>
     <ClInclude Include="src\app\editor\system\toast_manager.h">
       <Filter>App\Editor\System</Filter>
     </ClInclude>
@@ -581,9 +578,6 @@
     <ClCompile Include="src\app\editor\system\shortcut_manager.cc">
       <Filter>App\Editor\System</Filter>
     </ClCompile>
-    <ClCompile Include="src\app\editor\system\system_editor.cc">
-      <Filter>App\Editor\System</Filter>
-    </ClCompile>
     <ClCompile Include="src\app\gui\canvas.cc">
       <Filter>App\GUI</Filter>
     </ClCompile>
diff --git a/src/app/zelda3/dungeon/room.cc b/src/app/zelda3/dungeon/room.cc
index d7816d96..12f90570 100644
--- a/src/app/zelda3/dungeon/room.cc
+++ b/src/app/zelda3/dungeon/room.cc
@@ -681,7 +681,7 @@ void Room::LoadPits() {
   auto rom_data = rom()->vector();
   
   // Load pit data from pit_pointer
-  int pit_count = rom_data[pit_count + 1] << 8 | rom_data[pit_count];
+  // int pit_count = rom_data[pit_count + 1] << 8 | rom_data[pit_count];
   
   // For now, create placeholder pit objects
   // TODO: Implement full pit loading from ROM data
diff --git a/src/app/zelda3/dungeon/room_object.cc b/src/app/zelda3/dungeon/room_object.cc
index a90113d8..163f5415 100644
--- a/src/app/zelda3/dungeon/room_object.cc
+++ b/src/app/zelda3/dungeon/room_object.cc
@@ -85,7 +85,7 @@ void RoomObject::DrawTile(gfx::Tile16 t, int xx, int yy,
   }
   if (preview) {
     if (xx < 0x39 && yy < 0x39 && xx >= 0 && yy >= 0) {
-      gfx::TileInfo ti;  // t.GetTileInfo();
+      gfx::TileInfo ti = t.tile0_; // t.GetTileInfo();
       for (auto yl = 0; yl < 8; yl++) {
         for (auto xl = 0; xl < 4; xl++) {
           int mx = xl;
diff --git a/src/app/zelda3/music/tracker.cc b/src/app/zelda3/music/tracker.cc
index 775eafac..5efbc002 100644
--- a/src/app/zelda3/music/tracker.cc
+++ b/src/app/zelda3/music/tracker.cc
@@ -839,7 +839,7 @@ void Tracker::SaveSongs(Rom &rom) {
 
   ZeldaInstrument *zi;
 
-  SampleEdit *sed;
+  SampleEdit *sed = nullptr;
 
   short wtbl[128];
   short x[16];
@@ -1016,11 +1016,11 @@ void Tracker::SaveSongs(Rom &rom) {
               zi->multlo = o;
               zi->multhi = o >> 8;
 
-              if (sed && sed->editinst == m) {
-                sed->init = 1;
-                // SetDlgItemInt(sed->dlg, 3014, o, 0);
-                sed->init = 0;
-              }
+              // if (sed && sed->editinst == m) {
+              //   sed->init = 1;
+              //   // SetDlgItemInt(sed->dlg, 3014, o, 0);
+              //   sed->init = 0;
+              // }
             }
 
             zi++;