diff --git a/src/main/java/org/embeddedt/modernfix/mixin/bugfix/tf_cme_on_load/TwilightForestModMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/bugfix/tf_cme_on_load/TwilightForestModMixin.java
index 67f0bd2c..c05751f3 100644
--- a/src/main/java/org/embeddedt/modernfix/mixin/bugfix/tf_cme_on_load/TwilightForestModMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/mixin/bugfix/tf_cme_on_load/TwilightForestModMixin.java
@@ -15,7 +15,7 @@ public class TwilightForestModMixin {
 
     }
 
-    @Inject(method = "lambda$init$1", at = @At(value = "INVOKE", target = "Ltwilightforest/block/TFBlocks;tfCompostables()V", ordinal = 0))
+    @Inject(method = "lambda$init$1", at = @At(value = "INVOKE", target = "Ltwilightforest/block/TFBlocks;tfCompostables()V", ordinal = 0), remap = false)
     private static void doBiomeTypes(CallbackInfo ci) {
         BiomeKeys.addBiomeTypes();
     }
diff --git a/src/main/java/org/embeddedt/modernfix/mixin/devenv/NarratorMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/devenv/NarratorMixin.java
index 6c0754ae..1397a848 100644
--- a/src/main/java/org/embeddedt/modernfix/mixin/devenv/NarratorMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/mixin/devenv/NarratorMixin.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(NarratorChatListener.class)
 public class NarratorMixin {
-    @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Lcom/mojang/text2speech/Narrator;getNarrator()Lcom/mojang/text2speech/Narrator;"))
+    @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Lcom/mojang/text2speech/Narrator;getNarrator()Lcom/mojang/text2speech/Narrator;", remap = false))
     private Narrator useDummyNarrator() {
         return new NarratorDummy();
     }
diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/InputConstantsMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/InputConstantsMixin.java
index add53d70..d6a60cdb 100644
--- a/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/InputConstantsMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/InputConstantsMixin.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(InputConstants.class)
 public class InputConstantsMixin {
-    @Redirect(method = "isKeyDown", at = @At(value = "INVOKE", target = "Lorg/lwjgl/glfw/GLFW;glfwGetKey(JI)I"))
+    @Redirect(method = "isKeyDown", at = @At(value = "INVOKE", target = "Lorg/lwjgl/glfw/GLFW;glfwGetKey(JI)I", remap = false))
     private static int offThreadKeyFetch(long win, int k) {
         if(RenderSystem.isOnRenderThreadOrInit())
             return GLFW.glfwGetKey(win, k);
diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java
index a72df465..b8cf36a7 100644
--- a/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java
@@ -22,7 +22,7 @@ import java.util.concurrent.ExecutionException;
 public class ChunkGeneratorMixin {
     @Shadow @Final private List<ChunkPos> strongholdPositions;
 
-    @Inject(method = "generateStrongholds", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/Lists;newArrayList()Ljava/util/ArrayList;", ordinal = 0), cancellable = true)
+    @Inject(method = "generateStrongholds", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/Lists;newArrayList()Ljava/util/ArrayList;", ordinal = 0, remap = false), cancellable = true)
     private void useCachedDataIfAvailable(CallbackInfo ci) {
         ServerLevel level = searchLevel();
         if(level == null) {
diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/CustomIngredientMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/CustomIngredientMixin.java
index 8257fa5e..1cb9f048 100644
--- a/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/CustomIngredientMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/CustomIngredientMixin.java
@@ -14,7 +14,7 @@ import java.util.Set;
 public abstract class CustomIngredientMixin implements ICachedIngredientJS {
     @Shadow @Final private Ingredient ingredient;
 
-    @Shadow public abstract Set<ItemStackJS> getStacks();
+    @Shadow(remap = false) public abstract Set<ItemStackJS> getStacks();
 
     @Override
     public Set<ItemStackJS> getCachedStacks() {
diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/TagIngredientJSMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/TagIngredientJSMixin.java
index 88a75047..ac2ecf81 100644
--- a/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/TagIngredientJSMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/TagIngredientJSMixin.java
@@ -19,7 +19,7 @@ import java.util.Set;
 public abstract class TagIngredientJSMixin implements ICachedIngredientJS {
     @Shadow public abstract Tag<Item> getActualTag();
 
-    @Shadow public abstract Set<ItemStackJS> getStacks();
+    @Shadow(remap = false) public abstract Set<ItemStackJS> getStacks();
 
     /**
      * @author embeddedt