diff --git a/source/Configuration/PageAdvanced.cpp b/source/Configuration/PageAdvanced.cpp
index d792da62..b0ffcc00 100644
--- a/source/Configuration/PageAdvanced.cpp
+++ b/source/Configuration/PageAdvanced.cpp
@@ -129,6 +129,7 @@ INT_PTR CPageAdvanced::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, L
 				m_PropertySheetHelper.GetConfigNew().m_Apple2Type = NewCloneType;
 				m_PropertySheetHelper.GetConfigNew().m_CpuType = ProbeMainCpuDefault(NewCloneType);
 			}
+			break;
 
 		case IDC_COMBO_GAME_IO_CONNECTOR:
 			if (HIWORD(wparam) == CBN_SELCHANGE)
diff --git a/source/Debugger/Debugger_Display.cpp b/source/Debugger/Debugger_Display.cpp
index c7391001..bf40598e 100644
--- a/source/Debugger/Debugger_Display.cpp
+++ b/source/Debugger/Debugger_Display.cpp
@@ -3251,8 +3251,9 @@ static void DrawVideoScannerValue(int line, int vert, int horz, bool isVisible)
 //===========================================================================
 static void DrawVideoScannerInfo(int line)
 {
-	uint16_t v, h;
-	NTSC_GetVideoVertHorzForDebugger(v, h);		// update video scanner's vert/horz position - needed for when in fullspeed (GH#1164)
+	uint16_t vert, horz;
+	NTSC_GetVideoVertHorzForDebugger(vert, horz);		// update video scanner's vert/horz position - needed for when in fullspeed (GH#1164)
+	int v = vert, h = horz;	// use int, since 'h - 13' can go -ve
 
 	if (g_videoScannerDisplayInfo.isHorzReal)
 	{