diff --git a/src/emucore/ControllerDetector.cxx b/src/emucore/ControllerDetector.cxx
index 2ba2c296a..df842bc82 100644
--- a/src/emucore/ControllerDetector.cxx
+++ b/src/emucore/ControllerDetector.cxx
@@ -206,7 +206,7 @@ bool ControllerDetector::usesGenesisButton(const uInt8* image, uInt32 size, Cont
 {
   if(port == Controller::Left)
   {
-    const int NUM_SIGS_0 = 10;
+    const int NUM_SIGS_0 = 12;
     const int SIG_SIZE_0 = 3;
     uInt8 signature_0[NUM_SIGS_0][SIG_SIZE_0] = {
       { 0x24, 0x09, 0x10 }, // bit INPT1; bpl
@@ -219,6 +219,8 @@ bool ControllerDetector::usesGenesisButton(const uInt8* image, uInt32 size, Cont
       { 0xa5, 0x39, 0x30 }, // lda INPT1|$30; bmi
       { 0xa5, 0x39, 0x6a }, // lda INPT1|$30; ror
       { 0xa6, 0x39, 0x8e }, // ldx INPT1|$30; stx
+      { 0xa5, 0x09, 0x29 }, // lda INPT1; and
+      { 0xa4, 0x09, 0x30 }, // ldy INPT1; bmi
     };
     for(uInt32 i = 0; i < NUM_SIGS_0; ++i)
       if(searchForBytes(image, size, signature_0[i], SIG_SIZE_0))
diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx
index 4a7742469..275031952 100644
--- a/src/gui/GameInfoDialog.cxx
+++ b/src/gui/GameInfoDialog.cxx
@@ -91,7 +91,6 @@ GameInfoDialog::GameInfoDialog(
 
   myTypeDetected = new StaticTextWidget(myTab, ifont, t->getRight() + 8, ypos,
                                         "(CM (SpectraVideo CompuMate) detected)");
-  wid.push_back(myTypeDetected);
   ypos += ifont.getLineHeight() + VGAP * 4;
 
   pwidth = font.getStringWidth("Auto-detect");
@@ -109,7 +108,6 @@ GameInfoDialog::GameInfoDialog(
   wid.push_back(myFormat);
 
   myFormatDetected = new StaticTextWidget(myTab, ifont, myFormat->getRight() + 8, ypos + 4, "SECAM60 detected");
-  wid.push_back(myFormatDetected);
 
   // Phosphor
   ypos += lineHeight + VGAP;
@@ -211,7 +209,6 @@ GameInfoDialog::GameInfoDialog(
 
   myP0ControllerDetected = new StaticTextWidget(myTab, ifont, myP0Controller->getLeft(), ypos,
                                                 "BoosterGrip detected");
-  wid.push_back(myP0ControllerDetected);
   ypos += ifont.getLineHeight() + VGAP;
 
   myP1Label = new StaticTextWidget(myTab, font, HBORDER, ypos+1, "P1 controller    ");
@@ -221,7 +218,6 @@ GameInfoDialog::GameInfoDialog(
   ypos += lineHeight + VGAP;
   myP1ControllerDetected = new StaticTextWidget(myTab, ifont, myP1Controller->getLeft(), ypos,
                                                 "BoosterGrip detected");
-  wid.push_back(myP0ControllerDetected);
   ypos += ifont.getLineHeight() + VGAP + 4;
 
   mySwapPorts = new CheckboxWidget(myTab, font, myP0Controller->getRight() + fontWidth*4, myP0Controller->getTop()+1,