diff --git a/src/main/java/carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java
index 07b919b3..98e27432 100644
--- a/src/main/java/carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java
+++ b/src/main/java/carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java
@@ -110,8 +110,7 @@ public abstract class ChunkMap_scarpetChunkCreationMixin implements ThreadedAnvi
 
     // in protoChunkToFullChunk
     // fancier version of the one below, ensuring that the event is triggered when the chunk is actually loaded.
-    @SuppressWarnings("UnresolvedMixinReference")
-    @Inject(method = "method_20460", at = @At("HEAD"))
+    @Inject(method = "method_20460", at = @At("HEAD"), remap = false)
     private void onChunkGeneratedStart(ChunkHolder chunkHolder, Either<ChunkAccess, ChunkLoadingFailure> chunk, CallbackInfoReturnable<CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>>> cir)
     {
         if (CHUNK_GENERATED.isNeeded() || CHUNK_LOADED.isNeeded())
@@ -124,8 +123,7 @@ public abstract class ChunkMap_scarpetChunkCreationMixin implements ThreadedAnvi
         }
     }
 
-    @SuppressWarnings("UnresolvedMixinReference")
-    @Inject(method = "method_20460", at = @At("RETURN"))
+    @Inject(method = "method_20460", at = @At("RETURN"), remap = false)
     private void onChunkGeneratedEnd(ChunkHolder chunkHolder, Either<ChunkAccess, ChunkLoadingFailure> chunk, CallbackInfoReturnable<CompletableFuture<Either<ChunkAccess, ChunkLoadingFailure>>> cir)
     {
         Boolean localGenerated= generated.get();
diff --git a/src/main/java/carpet/mixins/Commands_customCommandsMixin.java b/src/main/java/carpet/mixins/Commands_customCommandsMixin.java
index e1332fa4..d525bc99 100644
--- a/src/main/java/carpet/mixins/Commands_customCommandsMixin.java
+++ b/src/main/java/carpet/mixins/Commands_customCommandsMixin.java
@@ -43,10 +43,10 @@ public abstract class Commands_customCommandsMixin
         CarpetSettings.impendingFillSkipUpdates.set(false);
     }
 
-    @SuppressWarnings("UnresolvedMixinReference")
     @Redirect(method = "performCommand", at = @At(
                 value = "INVOKE",
-                target = "Lorg/slf4j/Logger;isDebugEnabled()Z"
+                target = "Lorg/slf4j/Logger;isDebugEnabled()Z",
+                remap = false
             ),
         require = 0
     )
@@ -56,4 +56,4 @@ public abstract class Commands_customCommandsMixin
             return true;
         return logger.isDebugEnabled();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/carpet/mixins/Level_updateSuppressionCrashFixMixin.java b/src/main/java/carpet/mixins/Level_updateSuppressionCrashFixMixin.java
index bee8b5bf..73f1e55f 100644
--- a/src/main/java/carpet/mixins/Level_updateSuppressionCrashFixMixin.java
+++ b/src/main/java/carpet/mixins/Level_updateSuppressionCrashFixMixin.java
@@ -26,7 +26,7 @@ public class Level_updateSuppressionCrashFixMixin {
     )
     public void checkUpdateSuppression(BlockPos sourcePos, Block sourceBlock, BlockPos neighborPos, CallbackInfo ci, BlockState state,Throwable throwable){
         if(CarpetSettings.updateSuppressionCrashFix && (throwable instanceof ThrowableSuppression || throwable instanceof StackOverflowError)){
-            throw new ThrowableSuppression("Update suppression",neighborPos);
+            throw new ThrowableSuppression("Update suppression", neighborPos);
         }
     }
 }
diff --git a/src/main/java/carpet/mixins/PerfCommand_permissionMixin.java b/src/main/java/carpet/mixins/PerfCommand_permissionMixin.java
index fb69816a..a07fdd4d 100644
--- a/src/main/java/carpet/mixins/PerfCommand_permissionMixin.java
+++ b/src/main/java/carpet/mixins/PerfCommand_permissionMixin.java
@@ -11,8 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(PerfCommand.class)
 public class PerfCommand_permissionMixin
 {
-    @SuppressWarnings("UnresolvedMixinReference")
-    @Inject(method = "method_37340", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "method_37340", at = @At("HEAD"), cancellable = true, remap = false)
     private static void canRun(CommandSourceStack source, CallbackInfoReturnable<Boolean> cir)
     {
         cir.setReturnValue(source.hasPermission(CarpetSettings.perfPermissionLevel));
diff --git a/src/main/java/carpet/mixins/PieceGeneratorSupplier_plopMixin.java b/src/main/java/carpet/mixins/PieceGeneratorSupplier_plopMixin.java
index 2805a4ee..79c4e1c8 100644
--- a/src/main/java/carpet/mixins/PieceGeneratorSupplier_plopMixin.java
+++ b/src/main/java/carpet/mixins/PieceGeneratorSupplier_plopMixin.java
@@ -11,11 +11,10 @@ import net.minecraft.world.level.levelgen.structure.pieces.PieceGeneratorSupplie
 @Mixin(PieceGeneratorSupplier.class)
 public interface PieceGeneratorSupplier_plopMixin
 {
-    @SuppressWarnings("UnresolvedMixinReference")
     @Redirect(method = "method_39845", at = @At(
             value = "INVOKE",
             target = "java/util/function/Predicate.test(Ljava/lang/Object;)Z"
-    ))
+    ), remap = false)
     private static boolean checkMate(Predicate<Object> predicate, Object o)
     {
         return CarpetSettings.skipGenerationChecks.get() || predicate.test(o);
diff --git a/src/main/java/carpet/mixins/ReloadCommand_reloadAppsMixin.java b/src/main/java/carpet/mixins/ReloadCommand_reloadAppsMixin.java
index 35d8be92..f27abc7a 100644
--- a/src/main/java/carpet/mixins/ReloadCommand_reloadAppsMixin.java
+++ b/src/main/java/carpet/mixins/ReloadCommand_reloadAppsMixin.java
@@ -13,8 +13,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 public class ReloadCommand_reloadAppsMixin {
     //method_13530(Lcom/mojang/brigadier/context/CommandContext;)I
     // internal of register.
-    @SuppressWarnings("UnresolvedMixinReference")
-    @Inject(method = "method_13530", at = @At("TAIL"))
+    @Inject(method = "method_13530", at = @At("TAIL"), remap = false)
     private static void onReload(CommandContext<CommandSourceStack> context, CallbackInfoReturnable<Integer> cir)
     {
         // can't fetch here the reference to the server