diff --git a/src/main/java/me/cortex/voxy/client/mixin/iris/MixinIrisRenderingPipeline.java b/src/main/java/me/cortex/voxy/client/mixin/iris/MixinIrisRenderingPipeline.java
index 2d772993..478cd677 100644
--- a/src/main/java/me/cortex/voxy/client/mixin/iris/MixinIrisRenderingPipeline.java
+++ b/src/main/java/me/cortex/voxy/client/mixin/iris/MixinIrisRenderingPipeline.java
@@ -41,7 +41,7 @@ public class MixinIrisRenderingPipeline implements IGetVoxyPatchData, IGetIrisVo
         }
     }
 
-    @Inject(method = "beginLevelRendering", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/opengl/GlStateManager;_activeTexture(I)V", shift = At.Shift.BEFORE), remap = true)
+    @Inject(method = "beginLevelRendering", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/opengl/GlStateManager;_activeTexture(I)V", shift = At.Shift.BEFORE), remap = false)
     private void voxy$injectViewportSetup(CallbackInfo ci) {
         if (IrisUtil.CAPTURED_VIEWPORT_PARAMETERS != null) {
             var renderer = ((IGetVoxyRenderSystem) Minecraft.getInstance().levelRenderer).getVoxyRenderSystem();
diff --git a/src/main/java/me/cortex/voxy/commonImpl/WorldIdentifier.java b/src/main/java/me/cortex/voxy/commonImpl/WorldIdentifier.java
index a173773b..6442d3d1 100644
--- a/src/main/java/me/cortex/voxy/commonImpl/WorldIdentifier.java
+++ b/src/main/java/me/cortex/voxy/commonImpl/WorldIdentifier.java
@@ -79,25 +79,25 @@ public class WorldIdentifier {
         return instance.getNullable(this);
     }
 
-    public static WorldIdentifier of(Level world) {
+    public static WorldIdentifier of(Level level) {
         //Gets or makes an identifier for world
-        if (world == null) {
+        if (level == null) {
             return null;
         }
-        return ((IWorldGetIdentifier)world).voxy$getIdentifier();
+        return ((IWorldGetIdentifier)level).voxy$getIdentifier();
     }
 
     //Common utility function to get or create a world engine
-    public static WorldEngine ofEngine(Level world) {
-        var id = of(world);
+    public static WorldEngine ofEngine(Level level) {
+        var id = of(level);
         if (id == null) {
             return null;
         }
         return id.getOrCreateEngine();
     }
 
-    public static WorldEngine ofEngineNullable(Level world) {
-        var id = of(world);
+    public static WorldEngine ofEngineNullable(Level level) {
+        var id = of(level);
         if (id == null) {
             return null;
         }
diff --git a/src/main/java/me/cortex/voxy/commonImpl/mixin/chunky/MixinFabricWorld.java b/src/main/java/me/cortex/voxy/commonImpl/mixin/chunky/MixinFabricWorld.java
index fc5d9de4..5de56b17 100644
--- a/src/main/java/me/cortex/voxy/commonImpl/mixin/chunky/MixinFabricWorld.java
+++ b/src/main/java/me/cortex/voxy/commonImpl/mixin/chunky/MixinFabricWorld.java
@@ -16,7 +16,7 @@ import java.util.concurrent.CompletableFuture;
 
 @Mixin(FabricWorld.class)
 public class MixinFabricWorld {
-    @WrapOperation(method = "getChunkAtAsync", at = @At(value = "INVOKE", target = "Lorg/popcraft/chunky/mixin/ServerChunkCacheMixin;invokeGetChunkFutureMainThread(IILnet/minecraft/world/chunk/ChunkStatus;Z)Ljava/util/concurrent/CompletableFuture;"))
+    @WrapOperation(method = "getChunkAtAsync", at = @At(value = "INVOKE", target = "Lorg/popcraft/chunky/mixin/ServerChunkCacheMixin;invokeGetChunkFutureMainThread(IILnet/minecraft/world/level/chunk/status/ChunkStatus;Z)Ljava/util/concurrent/CompletableFuture;"))
     private CompletableFuture<ChunkResult<ChunkAccess>> captureGeneratedChunk(ServerChunkCacheMixin instance, int i, int j, ChunkStatus chunkStatus, boolean b, Operation<CompletableFuture<ChunkResult<ChunkAccess>>> original) {
         var future = original.call(instance, i, j, chunkStatus, b);
         if (false) {//TODO: ADD SERVER CONFIG THING