diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 49f3c9b2397cf84149257a39b33e8ace640e23fd..5edc8513aeab4e2d43bda8bd8a91a3d4ee42552d 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -171,7 +171,6 @@ static void read_inter_mode_probs(FRAME_CONTEXT *fc, aom_reader *r) {
 #endif
 }
 
-#if !CONFIG_EC_ADAPT
 #if CONFIG_EXT_INTER
 static void read_inter_compound_mode_probs(FRAME_CONTEXT *fc, aom_reader *r) {
   int i, j;
@@ -184,6 +183,7 @@ static void read_inter_compound_mode_probs(FRAME_CONTEXT *fc, aom_reader *r) {
   }
 }
 #endif  // CONFIG_EXT_INTER
+#if !CONFIG_EC_ADAPT
 #if !CONFIG_EXT_TX
 static void read_ext_tx_probs(FRAME_CONTEXT *fc, aom_reader *r) {
   int i, j, k;
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 57d99a1a87305d60e7ce0b93d37c18c2a3ab0e5c..712c00f140045a164392233bdb2a34221be5e559 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -335,8 +335,7 @@ static void prob_diff_update(const aom_tree_index *tree,
   for (i = 0; i < n - 1; ++i)
     av1_cond_prob_diff_update(w, &probs[i], branch_ct[i], probwt);
 }
-
-#if !CONFIG_EC_ADAPT
+#if CONFIG_EXT_INTER || CONFIG_EXT_TX || !CONFIG_EC_ADAPT
 static int prob_diff_update_savings(const aom_tree_index *tree,
                                     aom_prob probs[/*n - 1*/],
                                     const unsigned int counts[/*n - 1*/], int n,
@@ -354,7 +353,7 @@ static int prob_diff_update_savings(const aom_tree_index *tree,
   }
   return savings;
 }
-#endif
+#endif  // CONFIG_EXT_INTER || CONFIG_EXT_TX || !CONFIG_EC_ADAPT
 
 #if CONFIG_VAR_TX
 static void write_tx_size_vartx(const AV1_COMMON *cm, const MACROBLOCKD *xd,
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index abbcc7ef3f2803e6fbefd08ff690f2e688d61cd0..4de60effa8b36863364fb1f20b11fc8005f83f05 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -3154,7 +3154,7 @@ const int complexity_16x16_blocks_threshold[BLOCK_SIZES] = {
   1,
   4,
   4,
-  6
+  6,
 #if CONFIG_EXT_PARTITION
   // TODO(debargha): What are the correct numbers here?
   8,