diff --git a/av1/common/entropymv.c b/av1/common/entropymv.c
index 2443d710f..866bdb99b 100644
--- a/av1/common/entropymv.c
+++ b/av1/common/entropymv.c
@@ -130,8 +130,8 @@ static const uint8_t log_in_base_2[] = {
 #if CONFIG_GLOBAL_MOTION
 #if GLOBAL_TRANS_TYPES == 5
 const aom_tree_index av1_global_motion_types_tree[TREE_SIZE(
-    GLOBAL_TRANS_TYPES)] = { -IDENTITY, 2, -TRANSLATION, 4, -ROTZOOM, 6,
-    -AFFINE, -HOMOGRAPHY };
+    GLOBAL_TRANS_TYPES)] = { -IDENTITY, 2, -TRANSLATION, 4,
+                             -ROTZOOM,  6, -AFFINE,      -HOMOGRAPHY };
 
 static const aom_prob default_global_motion_types_prob[GLOBAL_TRANS_TYPES - 1] =
     { 224, 128, 192, 192 };
diff --git a/av1/common/warped_motion.c b/av1/common/warped_motion.c
index da74e55b4..34271e7c5 100644
--- a/av1/common/warped_motion.c
+++ b/av1/common/warped_motion.c
@@ -16,7 +16,7 @@
 
 #include "av1/common/warped_motion.h"
 
-#define ERRORADV_CLAMP  128
+#define ERRORADV_CLAMP 128
 
 static ProjectPointsFunc get_project_points_type(TransformationType type) {
   switch (type) {
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index b4a56f551..5c440e5c1 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -4029,19 +4029,19 @@ static void read_global_motion_params(WarpedMotionParams *params,
   switch (type) {
     case HOMOGRAPHY:
       params->wmmat[6] = aom_read_primitive_symmetric(r, GM_ABS_ROW3HOMO_BITS) *
-          GM_ROW3HOMO_DECODE_FACTOR;
+                         GM_ROW3HOMO_DECODE_FACTOR;
       params->wmmat[7] = aom_read_primitive_symmetric(r, GM_ABS_ROW3HOMO_BITS) *
-          GM_ROW3HOMO_DECODE_FACTOR;
+                         GM_ROW3HOMO_DECODE_FACTOR;
     case AFFINE:
     case ROTZOOM:
       params->wmmat[2] = aom_read_primitive_symmetric(r, GM_ABS_ALPHA_BITS) *
-                          GM_ALPHA_DECODE_FACTOR +
+                             GM_ALPHA_DECODE_FACTOR +
                          (1 << WARPEDMODEL_PREC_BITS);
       params->wmmat[3] = aom_read_primitive_symmetric(r, GM_ABS_ALPHA_BITS) *
                          GM_ALPHA_DECODE_FACTOR;
       if (type == AFFINE || type == HOMOGRAPHY) {
         params->wmmat[4] = aom_read_primitive_symmetric(r, GM_ABS_ALPHA_BITS) *
-                            GM_ALPHA_DECODE_FACTOR;
+                           GM_ALPHA_DECODE_FACTOR;
         params->wmmat[5] = aom_read_primitive_symmetric(r, GM_ABS_ALPHA_BITS) *
                                GM_ALPHA_DECODE_FACTOR +
                            (1 << WARPEDMODEL_PREC_BITS);
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index eacffd9e3..5907f1371 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1861,7 +1861,7 @@ static void read_inter_frame_mode_info(AV1Decoder *const pbi,
 
       if (use_rect_tx) {
         mbmi->tx_size = max_txsize_rect_lookup[bsize];
-        set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, xd);
+        set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, mbmi->skip, xd);
       } else {
 #endif  // CONFIG_EXT_TX && CONFIG_RECT_TX
         mbmi->min_tx_size = TX_SIZES_ALL;
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 848f73d25..48036d6cc 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1298,7 +1298,7 @@ static void pack_inter_mode_mvs(AV1_COMP *cpi, const MODE_INFO *mi,
       }
 
       if (is_rect_tx(mbmi->tx_size)) {
-        set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, xd);
+        set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, skip, xd);
       } else {
 #endif  // CONFIG_EXT_TX && CONFIG_RECT_TX
         for (idy = 0; idy < height; idy += bh)
@@ -3971,12 +3971,10 @@ static void write_global_motion_params(WarpedMotionParams *params,
                   &global_motion_types_encodings[type]);
   switch (type) {
     case HOMOGRAPHY:
-        aom_write_primitive_symmetric(
-            w, (params->wmmat[6] >> GM_ROW3HOMO_PREC_DIFF),
-            GM_ABS_ROW3HOMO_BITS);
-        aom_write_primitive_symmetric(
-            w, (params->wmmat[7] >> GM_ROW3HOMO_PREC_DIFF),
-            GM_ABS_ROW3HOMO_BITS);
+      aom_write_primitive_symmetric(
+          w, (params->wmmat[6] >> GM_ROW3HOMO_PREC_DIFF), GM_ABS_ROW3HOMO_BITS);
+      aom_write_primitive_symmetric(
+          w, (params->wmmat[7] >> GM_ROW3HOMO_PREC_DIFF), GM_ABS_ROW3HOMO_BITS);
     // fallthrough intended
     case AFFINE:
     case ROTZOOM:
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 3d2b210f0..f828653ce 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5473,7 +5473,8 @@ static void encode_superblock(const AV1_COMP *const cpi, ThreadData *td,
       !(mbmi->skip || seg_skip)) {
 #if CONFIG_EXT_TX && CONFIG_RECT_TX
     if (is_rect_tx(mbmi->tx_size)) {
-      set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, xd);
+      set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, (mbmi->skip || seg_skip),
+                    xd);
     } else {
       if (dry_run) tx_partition_set_contexts(cm, xd, bsize, mi_row, mi_col);
     }