diff --git a/src/cpu/x86_ops_misc.h b/src/cpu/x86_ops_misc.h
index 50da6f2a0..7fde5dacc 100644
--- a/src/cpu/x86_ops_misc.h
+++ b/src/cpu/x86_ops_misc.h
@@ -259,7 +259,7 @@ static int opF6_a32(uint32_t fetchdat)
 
 static int opF7_w_a16(uint32_t fetchdat)
 {
-        uint32_t templ, templ2;
+        uint32_t templ, templ2 = 0;
         int tempws, tempws2 = 0;
         int16_t temps16;
         uint16_t src, dst;
@@ -356,7 +356,7 @@ static int opF7_w_a16(uint32_t fetchdat)
 }
 static int opF7_w_a32(uint32_t fetchdat)
 {
-        uint32_t templ, templ2;
+        uint32_t templ, templ2 = 0;
         int tempws, tempws2 = 1;
         int16_t temps16;
         uint16_t src, dst;
diff --git a/src/sound/snd_sb.c b/src/sound/snd_sb.c
index 0a661f452..1038567fa 100644
--- a/src/sound/snd_sb.c
+++ b/src/sound/snd_sb.c
@@ -1235,6 +1235,7 @@ sb_16_reply_mca_write(int port, uint8_t val, void *p)
             addr = 0x280;
             break;
         case 0:
+        default:
             addr = 0;
             break;
     }
@@ -1280,6 +1281,7 @@ sb_16_reply_mca_write(int port, uint8_t val, void *p)
                 addr = 0x280;
                 break;
             case 0:
+            default:
                 addr = 0;
                 break;
         }
@@ -1291,6 +1293,7 @@ sb_16_reply_mca_write(int port, uint8_t val, void *p)
                 mpu401_addr = 0x300;
                 break;
             case 0:
+            default:
                 mpu401_addr = 0;
                 break;
         }