diff --git a/vp8/common/reconinter.c b/vp8/common/reconinter.c
index 1e6dfa3de0fb2cee2d8819d33c8f0d2662993504..fd3a0022b6452620e2e80df7dc92ab8deb0bae5a 100644
--- a/vp8/common/reconinter.c
+++ b/vp8/common/reconinter.c
@@ -712,7 +712,7 @@ void vp8_build_1st_inter16x16_predictors_mbuv(MACROBLOCKD *xd,
                   Temp, len, len, len);
 
         // Sub-pel filter
-        x->subpixel_predict8x8(pTemp, len,
+        xd->subpixel_predict8x8(pTemp, len,
                                _o16x16mv.as_mv.col & 15,
                                _o16x16mv.as_mv.row & 15,
                                pDst, dst_uvstride);
diff --git a/vp8/decoder/detokenize.c b/vp8/decoder/detokenize.c
index 15764dee43f0fea7ce676454204be9231643182c..adff88a59dad096674a68d1e2ab883dd9e859a25 100644
--- a/vp8/decoder/detokenize.c
+++ b/vp8/decoder/detokenize.c
@@ -106,7 +106,7 @@ void vp8_reset_mb_tokens_context(MACROBLOCKD *xd) {
       xd->mode_info_context->mbmi.mode != I8X8_PRED &&
       xd->mode_info_context->mbmi.mode != SPLITMV)
 #if CONFIG_TX16X16
-      || x->mode_info_context->mbmi.txfm_size == TX_16X16
+      || xd->mode_info_context->mbmi.txfm_size == TX_16X16
 #endif
       ) {
     vpx_memset(xd->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES));