diff --git a/apps/plugins/puzzles/SOURCES.games b/apps/plugins/puzzles/SOURCES.games
index 5f8c58b477..c46a541145 100644
--- a/apps/plugins/puzzles/SOURCES.games
+++ b/apps/plugins/puzzles/SOURCES.games
@@ -1,3 +1,5 @@
+/* commented-out games cannot be played due to controls and/or bugs */
+
 src/blackbox.c
 src/bridges.c
 src/cube.c
diff --git a/apps/plugins/puzzles/rockbox.c b/apps/plugins/puzzles/rockbox.c
index 94482cec69..1f3b307f25 100644
--- a/apps/plugins/puzzles/rockbox.c
+++ b/apps/plugins/puzzles/rockbox.c
@@ -1099,7 +1099,7 @@ static void quick_help(void)
     }
 }
 
-#ifdef SANSA_C200V2
+#if PLUGIN_BUFFER_SIZE <= 0x14000
 /* no full help available due to memory constraints, so we provide a
  * dummy function here */
 void full_help(const char *str)
@@ -1223,7 +1223,7 @@ static int pausemenu_cb(int action, const struct menu_item_ex *this_item)
                 return ACTION_EXIT_MENUITEM;
             break;
         case 7:
-#ifdef SANSA_C200V2
+#if PLUGIN_BUFFER_SIZE <= 0x14000
             return ACTION_EXIT_MENUITEM;
 #else
             break;
@@ -1819,7 +1819,7 @@ static int mainmenu_cb(int action, const struct menu_item_ex *this_item)
                 return ACTION_EXIT_MENUITEM;
             break;
         case 3:
-#ifdef SANSA_C200V2
+#if PLUGIN_BUFFER_SIZE <= 0x14000
             return ACTION_EXIT_MENUITEM;
 #else
             break;