diff --git a/src/font/SharedGridSet.zig b/src/font/SharedGridSet.zig
index a012786c0..8295993a3 100644
--- a/src/font/SharedGridSet.zig
+++ b/src/font/SharedGridSet.zig
@@ -556,7 +556,7 @@ pub const Key = struct {
         const autoHash = std.hash.autoHash;
         autoHash(hasher, self.descriptors.len);
         for (self.descriptors) |d| d.hash(hasher);
-        autoHash(hasher, self.codepoint_map);
+        self.codepoint_map.hash(hasher);
         autoHash(hasher, self.metric_modifiers.count());
         if (self.metric_modifiers.count() > 0) {
             inline for (@typeInfo(Metrics.Key).Enum.fields) |field| {
diff --git a/src/font/discovery.zig b/src/font/discovery.zig
index c926445fd..13a994f76 100644
--- a/src/font/discovery.zig
+++ b/src/font/discovery.zig
@@ -60,8 +60,9 @@ pub const Descriptor = struct {
     /// Hash the descriptor with the given hasher.
     pub fn hash(self: Descriptor, hasher: anytype) void {
         const autoHash = std.hash.autoHash;
-        autoHash(hasher, self.family);
-        autoHash(hasher, self.style);
+        const autoHashStrat = std.hash.autoHashStrat;
+        autoHashStrat(hasher, self.family, .Deep);
+        autoHashStrat(hasher, self.style, .Deep);
         autoHash(hasher, self.codepoint);
         autoHash(hasher, self.size);
         autoHash(hasher, self.bold);