diff --git a/source/blender/blenkernel/intern/bake_items_serialize.cc b/source/blender/blenkernel/intern/bake_items_serialize.cc
index 1eb599cc344..6d7a19b01ad 100644
--- a/source/blender/blenkernel/intern/bake_items_serialize.cc
+++ b/source/blender/blenkernel/intern/bake_items_serialize.cc
@@ -390,6 +390,10 @@ static std::shared_ptr<DictionaryValue> write_blob_simple_gspan(BlobWriter &blob
     return read_blob_raw_data_with_endian(
         blob_reader, io_data, sizeof(float), r_data.size() * 4, r_data.data());
   }
+  if (type.is<math::Quaternion>()) {
+    return read_blob_raw_data_with_endian(
+        blob_reader, io_data, sizeof(float), r_data.size() * 4, r_data.data());
+  }
   return false;
 }
 
diff --git a/source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl b/source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl
index b30f4ecebc6..ba184690eaf 100644
--- a/source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_sequencer_strips_frag.glsl
@@ -50,6 +50,8 @@ void main()
   vec2 pos1 = round(vec2(strip.left_handle, strip.bottom) * view_to_pixel);
   vec2 pos2 = round(vec2(strip.right_handle, strip.top) * view_to_pixel);
   pos2.x -= 1.0;
+  /* Make sure strip is at least 1px wide. */
+  pos2.x = max(pos2.x, pos1.x + 1.0);
   vec2 size = (pos2 - pos1) * 0.5;
   vec2 center = (pos1 + pos2) * 0.5;
   vec2 pos = round(co * view_to_pixel);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_simulation.cc b/source/blender/nodes/geometry/nodes/node_geo_simulation.cc
index 67da84ff592..5a2bc9bbd99 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_simulation.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_simulation.cc
@@ -1110,7 +1110,7 @@ void mix_baked_data_item(const eNodeSocketDatatype socket_type,
     case SOCK_ROTATION:
     case SOCK_RGBA:
     case SOCK_MATRIX: {
-      const CPPType &type = node_geo_simulation_cc::get_simulation_item_cpp_type(socket_type);
+      const CPPType &type = *bke::socket_type_to_geo_nodes_base_cpp_type(socket_type);
       SocketValueVariant prev_value_variant = *static_cast<const SocketValueVariant *>(prev);
       SocketValueVariant next_value_variant = *static_cast<const SocketValueVariant *>(next);
       if (prev_value_variant.is_context_dependent_field() ||
diff --git a/source/blender/nodes/geometry/nodes/node_geo_viewer.cc b/source/blender/nodes/geometry/nodes/node_geo_viewer.cc
index 90121cb6f62..bcaa3fe09a7 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_viewer.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_viewer.cc
@@ -96,6 +96,7 @@ static void node_gather_link_searches(GatherLinkSearchOpParams &params)
                            socket,
                            &node,
                            static_cast<bNodeSocket *>(node.inputs.first));
+          break;
         }
       }