diff --git a/src/Cafe/GameProfile/GameProfile.cpp b/src/Cafe/GameProfile/GameProfile.cpp
index 73a6e927..16812d1c 100644
--- a/src/Cafe/GameProfile/GameProfile.cpp
+++ b/src/Cafe/GameProfile/GameProfile.cpp
@@ -327,6 +327,7 @@ void GameProfile::Save(uint64_t title_id)
 
 #undef WRITE_OPTIONAL_ENTRY
 #undef WRITE_ENTRY
+#undef WRITE_ENTRY_NUMBERED
 
 	delete fs;
 }
diff --git a/src/gui/GameProfileWindow.cpp b/src/gui/GameProfileWindow.cpp
index 2500887a..aae450d8 100644
--- a/src/gui/GameProfileWindow.cpp
+++ b/src/gui/GameProfileWindow.cpp
@@ -137,7 +137,7 @@ GameProfileWindow::GameProfileWindow(wxWindow* parent, uint64_t title_id)
 
 		first_row->Add(new wxStaticText(panel, wxID_ANY, _("Buffer cache mode")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);
 
-		wxString cache_values[] = { _("device private"), _("device shared"), _("host") };
+		wxString cache_values[] = { _("auto"), _("device private"), _("device shared"), _("host") };
 		m_buffer_cache_mode = new wxChoice(panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, (int)std::size(cache_values), cache_values);
 		m_buffer_cache_mode->SetToolTip(_("EXPERT OPTION\nDecides how the buffer cache memory will be managed.\n\nMetal only\n\nRecommended: device private"));
 		first_row->Add(m_buffer_cache_mode, 0, wxALL, 5);