2 files changed, 6 insertions, 4 deletions

diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS
index dea254366f..ddd96ff49d 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -20,7 +20,9 @@ chessbox
 jpeg
 sudoku
 reversi
-#if (CONFIG_KEYPAD != SANSA_CLIP_PAD && CONFIG_KEYPAD != SANSA_M200_PAD)
+#if (CONFIG_KEYPAD != SANSA_CLIP_PAD && CONFIG_KEYPAD != SANSA_M200_PAD && \
+     CONFIG_KEYPAD != CREATIVEZVM_PAD && CONFIG_KEYPAD != CREATIVEZV_PAD && \
+     CONFIG_KEYPAD != RECORDER_PAD && CONFIG_KEYPAD != ONDIO_PAD)
 goban
 #endif
 #ifndef OLYMPUS_MROBE_500
diff --git a/apps/plugins/goban/goban.c b/apps/plugins/goban/goban.c
index 0286e1cdc5..d00f0d9ab2 100644
--- a/apps/plugins/goban/goban.c
+++ b/apps/plugins/goban/goban.c
@@ -236,9 +236,6 @@ enum plugin_status
 plugin_start (const void *parameter)
 {
     int btn;
-    int temp;
-
-    (void) temp;
 
     rb->mkdir ("/sgf");
 
@@ -496,6 +493,8 @@ plugin_start (const void *parameter)
 #if defined(GBN_BUTTON_NEXT_VAR)
         case GBN_BUTTON_NEXT_VAR:
         case GBN_BUTTON_NEXT_VAR | BUTTON_REPEAT:
+        {
+            int temp;
             if ((temp = next_variation_sgf ()) >= 0)
             {
                 draw_screen_display ();
@@ -512,6 +511,7 @@ plugin_start (const void *parameter)
                 draw_screen_display ();
             }
             break;
+        }
 #endif
 
         case BUTTON_NONE: