diff --git a/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs b/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs
index b91f0ec2fc..34967e5533 100644
--- a/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs
@@ -705,6 +705,8 @@ namespace BizHawk.Client.EmuHawk
 			GeneralUpdate();
 		}
 
+		protected override void GeneralUpdate() => UpdateBefore();
+
 		protected override void UpdateBefore()
 		{
 			if (!IsHandleCreated || IsDisposed)
diff --git a/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs b/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs
index 70be5a4d35..0a6a7fc3b2 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs
@@ -117,6 +117,8 @@ namespace BizHawk.Client.EmuHawk
 			bmpViewTiles.Refresh();
 		}
 
+		protected override void GeneralUpdate() => UpdateBefore();
+
 		protected override unsafe void UpdateBefore()
 		{
 			if (Emu == null)
diff --git a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs
index 0facf93e97..046feecd3b 100644
--- a/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs
@@ -48,6 +48,8 @@ namespace BizHawk.Client.EmuHawk
 			_ppu.InstallCallback1(() => Generate(), _scanline);
 		}
 
+		protected override void GeneralUpdate() => UpdateBefore();
+
 		private unsafe void DrawTile(int* dst, int pitch, byte* pal, byte* tile, int* finalPal)
 		{
 			dst += 7;
diff --git a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs
index 8f39c10b57..6a9752c6ed 100644
--- a/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs
@@ -27,6 +27,8 @@ namespace BizHawk.Client.EmuHawk
 			bmpViewSPPal.ChangeBitmapSize(256, 256);
 		}
 
+		protected override void GeneralUpdate() => UpdateBefore();
+
 		protected override void UpdateBefore()
 		{
 			DrawBacks();
diff --git a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs
index e95a295afa..d6cf9c3e98 100644
--- a/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs
@@ -26,6 +26,8 @@ namespace BizHawk.Client.EmuHawk
 			bmpViewBG.ChangeBitmapSize(256, 256);
 		}
 
+		protected override void GeneralUpdate() => UpdateBefore();
+
 		static unsafe void Draw8x8(byte* src, int* dest, int pitch, int* pal)
 		{
 			int inc = pitch - 8;
diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs
index 1a268b6eba..73572ce615 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamPoke.cs
@@ -98,7 +98,7 @@ namespace BizHawk.Client.EmuHawk
 				if (result)
 				{
 					var cheat = GlobalWin.CheatList.FirstOrDefault(c => c.Address == watch.Address && c.Domain == watch.Domain);
-					if (cheat != (Cheat)null)
+					if (!(cheat is null))
 					{
 						cheat.PokeValue(watch.Value); 
 					}
diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
index 714e8519f6..17a443b3e9 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
@@ -99,6 +99,8 @@ namespace BizHawk.Client.EmuHawk
 
 		public IEnumerable<Watch> Watches => _watches.Where(x => !x.IsSeparator);
 
+		protected override void GeneralUpdate() => FrameUpdate();
+
 		public void AddWatch(Watch watch)
 		{
 			_watches.Add(watch);
@@ -768,7 +770,7 @@ namespace BizHawk.Client.EmuHawk
 
 				poke.SetWatch(SelectedWatches);
 
-				if (poke.ShowHawkDialog(this) == DialogResult.OK)
+				if (poke.ShowHawkDialog(this).IsOk())
 				{
 					GeneralUpdate();
 				}