diff --git a/Qt/debugger_disasm.cpp b/Qt/debugger_disasm.cpp
index abe9c43376..4ba06557de 100644
--- a/Qt/debugger_disasm.cpp
+++ b/Qt/debugger_disasm.cpp
@@ -368,9 +368,10 @@ void Debugger_Disasm::UpdateBreakpointsGUI()
 	ui->breakpointsList->clear();
 
 	EmuThread_LockDraw(true);
-	for(int i = 0; i < CBreakPoints::GetNumBreakpoints(); i++)
+	auto breakpoints = CBreakPoints::GetBreakPoints();
+	for(size_t i = 0; i < breakpoints.size(); i++)
 	{
-		u32 addr_ = CBreakPoints::GetBreakpointAddress(i);
+		u32 addr_ = breakpoints[i].addr;
 		if(!CBreakPoints::IsTempBreakPoint(addr_))
 		{
 			QTreeWidgetItem* item = new QTreeWidgetItem();
diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp
index 97d350cc98..fc5a66cdc5 100644
--- a/Qt/mainwindow.cpp
+++ b/Qt/mainwindow.cpp
@@ -138,7 +138,7 @@ void MainWindow::UpdateMenus()
 	ui->action_AF16x->setChecked(g_Config.iAnisotropyLevel == 16);
 
 	ui->action_OptionsBufferedRendering->setChecked(g_Config.bBufferedRendering);
-	ui->action_OptionsLinearFiltering->setChecked(g_Config.bLinearFiltering);
+	ui->action_OptionsLinearFiltering->setChecked(3 == g_Config.iTexFiltering);
 	ui->action_Simple_2xAA->setChecked(g_Config.SSAntiAliasing);
 
 	ui->action_OptionsScreen1x->setChecked(0 == (g_Config.iWindowZoom - 1));
@@ -500,7 +500,10 @@ void MainWindow::on_action_OptionsBufferedRendering_triggered()
 
 void MainWindow::on_action_OptionsLinearFiltering_triggered()
 {
-	g_Config.bLinearFiltering = !g_Config.bLinearFiltering;
+	if (g_Config.iTexFiltering == 0)
+		g_Config.iTexFiltering = 3;
+	else
+		g_Config.iTexFiltering = 0;
 	UpdateMenus();
 }