diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java
index 08ac0530..53c3b846 100644
--- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java
+++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java
@@ -20,7 +20,7 @@ public class MinecraftMixin {
 
     @Inject(method = "tick", at = @At("HEAD"))
     private void onClientTick(CallbackInfo ci) {
-        if(this.overlay == null) {
+        if(this.overlay == null && ModernFixClient.INSTANCE != null) {
             ModernFixClient.INSTANCE.onGameLaunchFinish();
         }
     }
diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resource_key_equality/ResourceKeyMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resource_key_equality/ResourceKeyMixin.java
new file mode 100644
index 00000000..4fdf86b7
--- /dev/null
+++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resource_key_equality/ResourceKeyMixin.java
@@ -0,0 +1,18 @@
+package org.embeddedt.modernfix.forge.mixin.perf.resource_key_equality;
+
+import net.minecraft.resources.ResourceKey;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+
+@Mixin(ResourceKey.class)
+public class ResourceKeyMixin {
+    /**
+     * @author embeddedt
+     * @reason ResourceKeys are interned, so there is no reason to waste time doing any deeper comparison. This override
+     * is patched in by Forge, it doesn't exist in vanilla
+     */
+    @Overwrite(remap = false)
+    public boolean equals(Object o) {
+        return o == this;
+    }
+}