diff --git a/src/win/win_media_menu.c b/src/win/win_media_menu.c
index c9901d890..7b7aae788 100644
--- a/src/win/win_media_menu.c
+++ b/src/win/win_media_menu.c
@@ -516,13 +516,13 @@ media_menu_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
 	case IDM_CASSETTE_RECORD:
 		pc_cas_set_mode(cassette, 1);
-		CheckMenuItem(menus[i], IDM_CASSETTE_RECORD, MF_BYCOMMAND | MF_CHECKED);
-		CheckMenuItem(menus[i], IDM_CASSETTE_PLAY, MF_BYCOMMAND | MF_UNCHECKED);
+		CheckMenuItem(menus[CASSETTE_FIRST], IDM_CASSETTE_RECORD, MF_BYCOMMAND | MF_CHECKED);
+		CheckMenuItem(menus[CASSETTE_FIRST], IDM_CASSETTE_PLAY, MF_BYCOMMAND | MF_UNCHECKED);
 		break;
 	case IDM_CASSETTE_PLAY:
 		pc_cas_set_mode(cassette, 0);
-		CheckMenuItem(menus[i], IDM_CASSETTE_RECORD, MF_BYCOMMAND | MF_UNCHECKED);
-		CheckMenuItem(menus[i], IDM_CASSETTE_PLAY, MF_BYCOMMAND | MF_CHECKED);
+		CheckMenuItem(menus[CASSETTE_FIRST], IDM_CASSETTE_RECORD, MF_BYCOMMAND | MF_UNCHECKED);
+		CheckMenuItem(menus[CASSETTE_FIRST], IDM_CASSETTE_PLAY, MF_BYCOMMAND | MF_CHECKED);
 		break;
 	case IDM_CASSETTE_REWIND:
 		pc_cas_rewind(cassette);
diff --git a/src/win/win_ui.c b/src/win/win_ui.c
index 92e790dd3..237324d0b 100644
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -176,6 +176,7 @@ video_toggle_option(HMENU h, int *val, int id)
     device_force_redraw();
 }
 
+#if defined(DEV_BRANCH) && defined(USE_OPENGL)
 /* Recursively finds and deletes target submenu */
 static int
 delete_submenu(HMENU parent, HMENU target)
@@ -203,6 +204,7 @@ delete_submenu(HMENU parent, HMENU target)
 
 	return 0;
 }
+#endif
 
 static void
 show_render_options_menu()