diff --git a/BizHawk.MultiClient/tools/MemoryViewer.cs b/BizHawk.MultiClient/tools/MemoryViewer.cs
index 487b480098..1a5d9ecc5b 100644
--- a/BizHawk.MultiClient/tools/MemoryViewer.cs
+++ b/BizHawk.MultiClient/tools/MemoryViewer.cs
@@ -43,7 +43,7 @@ namespace BizHawk.MultiClient
 		{
 			SetStyle(ControlStyles.AllPaintingInWmPaint, true);
 			SetStyle(ControlStyles.UserPaint, true);
-			SetStyle(ControlStyles.DoubleBuffer, true);
+			SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
 			this.BorderStyle = BorderStyle.Fixed3D;
 			this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.MemoryViewer_MouseMove);
 			this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.MemoryViewer_MouseClick);
diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs
index 48d61bae93..90bb83eff4 100644
--- a/BizHawk.MultiClient/tools/RamSearch.cs
+++ b/BizHawk.MultiClient/tools/RamSearch.cs
@@ -70,28 +70,31 @@ namespace BizHawk.MultiClient
 
 		public void UpdateValues()
 		{
-			if (!this.IsHandleCreated || this.IsDisposed) return;
-			
-			if (searchList.Count > 8)
-				SearchListView.BlazingFast = true;
-			sortReverse = false;
-			sortedCol = "";
-			for (int x = 0; x < searchList.Count; x++)
+			unchecked
 			{
-				searchList[x].prev = searchList[x].value;
-				searchList[x].PeekAddress(Domain);
+				if (!this.IsHandleCreated || this.IsDisposed) return;
 
-				if (searchList[x].prev != searchList[x].value)
-					searchList[x].changecount++;
+				if (searchList.Count > 8)
+					SearchListView.BlazingFast = true;
+				sortReverse = false;
+				sortedCol = "";
+				for (int x = 0; x < searchList.Count; x++)
+				{
+					searchList[x].prev = searchList[x].value;
+					searchList[x].PeekAddress(Domain);
 
+					if (searchList[x].prev != searchList[x].value)
+						searchList[x].changecount++;
+
+				}
+				if (AutoSearchCheckBox.Checked)
+					DoSearch();
+				else if (Global.Config.RamSearchPreviewMode)
+					DoPreview();
+
+				SearchListView.Refresh();
+				SearchListView.BlazingFast = false;
 			}
-			if (AutoSearchCheckBox.Checked)
-				DoSearch();
-			else if (Global.Config.RamSearchPreviewMode)
-				DoPreview();
-
-			SearchListView.Refresh();
-			SearchListView.BlazingFast = false;
 		}
 
 		private void RamSearch_Load(object sender, EventArgs e)
diff --git a/BizHawk.Util/VirtualListView.cs b/BizHawk.Util/VirtualListView.cs
index 3f600f9e66..426dc32fd2 100644
--- a/BizHawk.Util/VirtualListView.cs
+++ b/BizHawk.Util/VirtualListView.cs
@@ -383,7 +383,7 @@ namespace BizHawk
 
 			ptrlvhti = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(LVHITTESTINFO)));
 
-			SetStyle(ControlStyles.DoubleBuffer, true);
+			SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
 			SetStyle(ControlStyles.Opaque, true);
 			SetStyle(ControlStyles.AllPaintingInWmPaint, true);
 		}