diff --git a/examples/vp8_set_maps.txt b/examples/vp8_set_maps.txt
index 94554bac04e3a891084c7e3306d73424e838c54a..ad9ef61c562a46d039f7d062049dbfd8b44be065 100644
--- a/examples/vp8_set_maps.txt
+++ b/examples/vp8_set_maps.txt
@@ -78,8 +78,8 @@ if(frame_cnt + 1 == 22) {
 } else if(frame_cnt + 1 == 44) {
     vpx_active_map_t  active;
 
-    active.rows = 240/16;
-    active.cols = 320/16;
+    active.rows = cfg.g_h/16;
+    active.cols = cfg.g_w/16;
 
     /* pass in null map to disable active_map*/
     active.active_map = NULL;
diff --git a/vp8/decoder/decoderthreading.h b/vp8/decoder/decoderthreading.h
index 25dee8fe888ae49af43145317a15fb1e38e810f5..60c39d1e10a57f0a527513f0b69be64c2bbf3718 100644
--- a/vp8/decoder/decoderthreading.h
+++ b/vp8/decoder/decoderthreading.h
@@ -19,7 +19,7 @@
 extern void vp8mt_decode_mb_rows(VP8D_COMP *pbi, MACROBLOCKD *xd);
 extern void vp8_decoder_remove_threads(VP8D_COMP *pbi);
 extern void vp8_decoder_create_threads(VP8D_COMP *pbi);
-extern int vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows);
+extern void vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows);
 extern void vp8mt_de_alloc_temp_buffers(VP8D_COMP *pbi, int mb_rows);
 #endif
 
diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c
index fc2fad516d131fc9fc2aec4fce562bcb1556b6a1..fea4e1cc1ad19579b4540f7818efe089f66c9916 100644
--- a/vp8/decoder/threading.c
+++ b/vp8/decoder/threading.c
@@ -596,7 +596,7 @@ void vp8mt_de_alloc_temp_buffers(VP8D_COMP *pbi, int mb_rows)
 }
 
 
-int vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows)
+void vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows)
 {
 #if CONFIG_MULTITHREAD
     VP8_COMMON *const pc = & pbi->common;
@@ -647,7 +647,6 @@ int vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows)
         for (i=0; i< pc->mb_rows; i++)
             CHECK_MEM_ERROR(pbi->mt_vleft_col[i], vpx_calloc(sizeof(unsigned char) * 8, 1));
     }
-    return 0;
 #else
     (void) pbi;
     (void) width;
diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c
index 6a2872031347200d84052d8b497cb0278a8d67ef..a77a9b2f727b599bfe19e7a4c7fcdf0085157798 100644
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -104,6 +104,7 @@ update_error_state(vpx_codec_alg_priv_t                 *ctx,
 }
 
 
+#undef ERROR
 #define ERROR(str) do {\
         ctx->base.err_detail = str;\
         return VPX_CODEC_INVALID_PARAM;\