diff --git a/.rive_head b/.rive_head
index c4eeecd1..3813c3bf 100644
--- a/.rive_head
+++ b/.rive_head
@@ -1 +1 @@
-eca00184b8fb096243a60594f94f91f39607a15e
+b153a81b61b570f0d147916d96e28cbfcf0ad198
diff --git a/dependencies/gen_harfbuzz_renames/gen_renames.sh b/dependencies/gen_harfbuzz_renames/gen_renames.sh
index 1900497b..f78ea758 100755
--- a/dependencies/gen_harfbuzz_renames/gen_renames.sh
+++ b/dependencies/gen_harfbuzz_renames/gen_renames.sh
@@ -8,7 +8,7 @@ if [[ ! -f "dependencies/bin/premake5" ]]; then
     pushd dependencies
     # v5.0.0-beta2 doesn't support apple silicon properly, update the branch
     # once a stable one is avaialble that supports it
-    git clone --depth 1 --branch master https://github.com/premake/premake-core.git
+    git clone --depth 1 --branch v5.0.0-beta3 https://github.com/premake/premake-core.git
     pushd premake-core
     if [[ $LOCAL_ARCH == "arm64" ]]; then
         PREMAKE_MAKE_ARCH=ARM
diff --git a/dependencies/gen_libjpeg_renames/gen_renames.sh b/dependencies/gen_libjpeg_renames/gen_renames.sh
index 6f45c0bf..4c0ea5f1 100755
--- a/dependencies/gen_libjpeg_renames/gen_renames.sh
+++ b/dependencies/gen_libjpeg_renames/gen_renames.sh
@@ -10,7 +10,7 @@ if [[ ! -f "dependencies/bin/premake5" ]]; then
     pushd dependencies
     # v5.0.0-beta2 doesn't support apple silicon properly, update the branch
     # once a stable one is avaialble that supports it
-    git clone --depth 1 --branch master https://github.com/premake/premake-core.git
+    git clone --depth 1 --branch v5.0.0-beta3 https://github.com/premake/premake-core.git
     pushd premake-core
     if [[ $LOCAL_ARCH == "arm64" ]]; then
         PREMAKE_MAKE_ARCH=ARM
diff --git a/dependencies/gen_yoga_renames/gen_renames.sh b/dependencies/gen_yoga_renames/gen_renames.sh
index eadf7d7c..e624aa92 100755
--- a/dependencies/gen_yoga_renames/gen_renames.sh
+++ b/dependencies/gen_yoga_renames/gen_renames.sh
@@ -8,7 +8,7 @@ if [[ ! -f "dependencies/bin/premake5" ]]; then
     pushd dependencies
     # v5.0.0-beta2 doesn't support apple silicon properly, update the branch
     # once a stable one is avaialble that supports it
-    git clone --depth 1 --branch master https://github.com/premake/premake-core.git
+    git clone --depth 1 --branch v5.0.0-beta3 https://github.com/premake/premake-core.git
     pushd premake-core
     if [[ $LOCAL_ARCH == "arm64" ]]; then
         PREMAKE_MAKE_ARCH=ARM
diff --git a/tests/diff.py b/tests/diff.py
index be423278..c6d45d6a 100644
--- a/tests/diff.py
+++ b/tests/diff.py
@@ -131,9 +131,12 @@ class TestEntry(object):
 
     # this is equivalent of implementing < operator. We use this for sorted and sort functions
     def __lt__(self, other):
-        if (self.histogram is not None and
-            other.histogram is not None and
-            self.histogram != other.histogram):
+        # Always sort by avg first. Histogram is a good heuristic to divide into
+        # "pass/fail" buckets, but it's helpful to then see the fail bucked
+        # sorted by avg, which is more sensitive to differences.
+        if (self.avg == other.avg and
+            self.histogram is not None and
+            other.histogram is not None):
             # LOWER histogram values mean worse matches. Sort the bad matches first.
             return self.histogram > other.histogram
         else:
diff --git a/tests/unit_tests/test.sh b/tests/unit_tests/test.sh
index e81e8e29..f9cdb09d 100755
--- a/tests/unit_tests/test.sh
+++ b/tests/unit_tests/test.sh
@@ -31,7 +31,7 @@ if [[ ! -f "dependencies/bin/premake5" ]]; then
   if [[ $machine = "macosx" ]]; then
     # v5.0.0-beta2 doesn't support apple silicon properly, update the branch
     # once a stable one is avaialble that supports it
-    git clone --depth 1 --branch master https://github.com/premake/premake-core.git
+    git clone --depth 1 --branch v5.0.0-beta3 https://github.com/premake/premake-core.git
     pushd premake-core
     if [[ $LOCAL_ARCH == "arm64" ]]; then
       PREMAKE_MAKE_ARCH=ARM