diff --git a/UI/Debugger/Config/HexEditorInfo.cs b/UI/Debugger/Config/HexEditorInfo.cs
index 7dfb47e..c1cbc8a 100644
--- a/UI/Debugger/Config/HexEditorInfo.cs
+++ b/UI/Debugger/Config/HexEditorInfo.cs
@@ -17,8 +17,8 @@ namespace Mesen.GUI.Config
 	public class HexEditorInfo
 	{
 		public bool HighDensityTextMode = false;
-		public bool EnablePerByteNavigation = false;
-		public bool ByteEditingMode = false;
+		public bool EnablePerByteNavigation = true;
+		public bool ByteEditingMode = true;
 		public bool AutoRefresh = true;
 		public RefreshSpeed AutoRefreshSpeed = RefreshSpeed.Normal;
 		public bool IgnoreRedundantWrites = false;
@@ -42,11 +42,8 @@ namespace Mesen.GUI.Config
 		public bool HideExecutedBytes = false;
 		public bool HighlightBreakpoints = false;
 		public bool HighlightLabelledBytes = false;
-		public bool HighlightChrDrawnBytes = false;
-		public bool HighlightChrReadBytes = false;
 		public bool HighlightCodeBytes = false;
 		public bool HighlightDataBytes = false;
-		public bool HighlightDmcDataBytes = false;
 
 		public XmlColor ReadColor = Color.Blue;
 		public XmlColor WriteColor = Color.Red;
diff --git a/UI/Debugger/MemoryTools/ctrlHexViewer.cs b/UI/Debugger/MemoryTools/ctrlHexViewer.cs
index b73f6d1..772ec49 100644
--- a/UI/Debugger/MemoryTools/ctrlHexViewer.cs
+++ b/UI/Debugger/MemoryTools/ctrlHexViewer.cs
@@ -523,7 +523,7 @@ namespace Mesen.GUI.Debugger.Controls
 
 			Breakpoint bp = BreakpointManager.GetMatchingBreakpoint(startAddress, endAddress, _memoryType);
 			if(bp == null) {
-				bp = new Breakpoint() { Address = startAddress, MemoryType = _memoryType, StartAddress = startAddress, EndAddress = endAddress, AddressType = addressType, BreakOnWrite = true, BreakOnRead = true };
+				bp = new Breakpoint() { Address = startAddress, MemoryType = _memoryType, CpuType = _memoryType.ToCpuType(), StartAddress = startAddress, EndAddress = endAddress, AddressType = addressType, BreakOnWrite = true, BreakOnRead = true };
 				if(bp.IsCpuBreakpoint) {
 					bp.BreakOnExec = true;
 				}
diff --git a/UI/Interop/DebugApi.cs b/UI/Interop/DebugApi.cs
index 21368bc..336bd9c 100644
--- a/UI/Interop/DebugApi.cs
+++ b/UI/Interop/DebugApi.cs
@@ -190,6 +190,19 @@ namespace Mesen.GUI
 				case SnesMemoryType.SpcRom:
 					return CpuType.Spc;
 
+				case SnesMemoryType.GsuMemory:
+				case SnesMemoryType.GsuWorkRam:
+					return CpuType.Gsu;
+
+				case SnesMemoryType.Sa1InternalRam:
+				case SnesMemoryType.Sa1Memory:
+					return CpuType.Sa1;
+
+				case SnesMemoryType.DspDataRam:
+				case SnesMemoryType.DspDataRom:
+				case SnesMemoryType.DspProgramRom:
+					return CpuType.NecDsp;
+
 				default:
 					return CpuType.Cpu;
 			}