diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c
index ed6338f179..cdbfef631f 100644
--- a/libavcodec/cbs_av1_syntax_template.c
+++ b/libavcodec/cbs_av1_syntax_template.c
@@ -511,7 +511,7 @@ static int FUNC(tile_info)(CodedBitstreamContext *ctx, RWContext *rw,

         tile_height_sb = (sb_rows + (1 << current->tile_rows_log2) - 1) >>
             current->tile_rows_log2;
-        priv->tile_cols = (sb_rows + tile_height_sb - 1) / tile_height_sb;
+        priv->tile_rows = (sb_rows + tile_height_sb - 1) / tile_height_sb;

     } else {
         int widest_tile_sb, start_sb, size_sb, max_width, max_height;
@@ -1393,6 +1393,7 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw,
         if (current->refresh_frame_flags & (1 << i)) {
             priv->ref[i] = (AV1ReferenceFrameState) {
                 .valid          = 1,
+                .frame_type     = current->frame_type,
                 .upscaled_width = priv->upscaled_width,
                 .frame_width    = priv->frame_width,
                 .frame_height   = priv->frame_height,
@@ -1469,6 +1470,9 @@ static int FUNC(tile_group_obu)(CodedBitstreamContext *ctx, RWContext *rw,

     CHECK(FUNC(byte_alignment)(ctx, rw));

+    if (current->tg_end == num_tiles - 1)
+        priv->seen_frame_header = 0;
+
     // Tile data follows.

     return 0;