diff --git a/src/app/rom.cc b/src/app/rom.cc
index d6e3aa89..dd35976d 100644
--- a/src/app/rom.cc
+++ b/src/app/rom.cc
@@ -252,7 +252,7 @@ absl::Status ROM::LoadAllGraphicsData() {
       }
       graphics_bin_[i] =
           gfx::Bitmap(core::kTilesheetWidth, core::kTilesheetHeight,
-                      core::kTilesheetDepth, converted_sheet.data(), 0x1000);
+                      core::kTilesheetDepth, converted_sheet);
       graphics_bin_.at(i).CreateTexture(renderer_);
 
       if (flags()->kUseBitmapManager) {
@@ -260,16 +260,7 @@ absl::Status ROM::LoadAllGraphicsData() {
           graphics_buffer_.push_back(graphics_manager_[i]->at(j));
         }
       }
-      for (int j = 0; j < graphics_bin_[i].size(); ++j) {
-        graphics_buffer_.push_back(graphics_bin_.at(i).at(j));
-      }
-
     } else {
-      if (flags()->kUseBitmapManager) {
-        for (int j = 0; j < graphics_manager_[0].get()->size(); ++j) {
-          graphics_buffer_.push_back(0xFF);
-        }
-      }
       for (int j = 0; j < graphics_bin_[0].size(); ++j) {
         graphics_buffer_.push_back(0xFF);
       }
diff --git a/src/app/zelda3/screen/inventory.cc b/src/app/zelda3/screen/inventory.cc
index a46c7d21..91d125d6 100644
--- a/src/app/zelda3/screen/inventory.cc
+++ b/src/app/zelda3/screen/inventory.cc
@@ -62,7 +62,7 @@ void Inventory::Create() {
     }
   }
 
-  PRINT_IF_ERROR(bitmap_.InitializeFromData(256, 256, 8, data_))
+  bitmap_.Create(256, 256, 8, data_);
   bitmap_.ApplyPalette(palette_);
   rom()->RenderBitmap(&bitmap_);
 }
diff --git a/src/app/zelda3/screen/title_screen.cc b/src/app/zelda3/screen/title_screen.cc
index bd207edc..cdb647b0 100644
--- a/src/app/zelda3/screen/title_screen.cc
+++ b/src/app/zelda3/screen/title_screen.cc
@@ -42,7 +42,7 @@ void TitleScreen::BuildTileset() {
   staticgfx[15] = 112;
 
   // Loaded gfx for the current screen (empty at this point)
-  uchar* currentmapgfx8Data = tiles8Bitmap.data();
+  uchar* currentmapgfx8Data = tiles8Bitmap.mutable_data().data();
 
   // All gfx of the game pack of 2048 bytes (4bpp)
   uchar* allgfxData = nullptr;  // rom_.GetMasterGraphicsBin();