diff --git a/vp8/decoder/detokenize.c b/vp8/decoder/detokenize.c
index adff88a59dad096674a68d1e2ab883dd9e859a25..a6c837084310bf68ca1fb043fae3913a413887b8 100644
--- a/vp8/decoder/detokenize.c
+++ b/vp8/decoder/detokenize.c
@@ -295,6 +295,7 @@ static int vp8_decode_coefs(VP8D_COMP *dx, const MACROBLOCKD *xd,
   const vp8_prob *prob, *coef_probs;
 
   switch (block_type) {
+    default:
     case TX_4X4:
       coef_probs = fc->coef_probs[type][0][0];
       break;
@@ -302,7 +303,7 @@ static int vp8_decode_coefs(VP8D_COMP *dx, const MACROBLOCKD *xd,
       coef_probs = fc->coef_probs_8x8[type][0][0];
       break;
 #if CONFIG_TX16X16
-    default:
+    case TX_16X16:
       coef_probs = fc->coef_probs_16x16[type][0][0];
       break;
 #endif
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index ac53fa98cbc96b4a399452afe304f45fe69d333c..d217f2ffc722026b2ae984d8e6c67ac04305f100 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -2943,7 +2943,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
   int uv_intra_rate_8x8 = 0, uv_intra_distortion_8x8 = 0, uv_intra_rate_tokenonly_8x8 = 0;
   int uv_intra_skippable_8x8 = 0;
   int rate_y, UNINITIALIZED_IS_SAFE(rate_uv);
-  int distortion_uv;
+  int distortion_uv = INT_MAX;
   int64_t best_yrd = INT64_MAX;
 #if CONFIG_PRED_FILTER
   int best_filter_state;