diff --git a/gradle.properties b/gradle.properties
index ac8a7f04..f66ae0b4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx1G
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
 	minecraft_version=1.17.1-pre1
-	yarn_mappings=1.17.1-pre1+build.1
+	yarn_mappings=1.17.1-pre1+build.9
 	loader_version=0.11.6
-	fabric_version=0.35.2+1.17
+	fabric_version=0.36.0+1.17
 
 # Mod Properties
 	mod_version = 1.4.40
diff --git a/src/main/java/carpet/mixins/EndGatewayBlockEntity_creativeNoClipMixin.java b/src/main/java/carpet/mixins/EndGatewayBlockEntity_creativeNoClipMixin.java
index 8d3703d0..36df899d 100644
--- a/src/main/java/carpet/mixins/EndGatewayBlockEntity_creativeNoClipMixin.java
+++ b/src/main/java/carpet/mixins/EndGatewayBlockEntity_creativeNoClipMixin.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(EndGatewayBlockEntity.class)
 public class EndGatewayBlockEntity_creativeNoClipMixin
 {
-    @Inject(method = "method_30276", cancellable = true, at = @At("HEAD"))
+    @Inject(method = "canTeleport", cancellable = true, at = @At("HEAD"))
     private static void checkFlyingCreative(Entity entity, CallbackInfoReturnable<Boolean> cir)
     {
         if (CarpetSettings.isCreativeFlying(entity)) cir.setReturnValue(false);
diff --git a/src/main/java/carpet/mixins/StructureBlockBlockEntityRenderer_mixin.java b/src/main/java/carpet/mixins/StructureBlockBlockEntityRenderer_mixin.java
index 25f25786..57cf46c6 100644
--- a/src/main/java/carpet/mixins/StructureBlockBlockEntityRenderer_mixin.java
+++ b/src/main/java/carpet/mixins/StructureBlockBlockEntityRenderer_mixin.java
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 @Mixin(StructureBlockBlockEntityRenderer.class)
 public abstract class StructureBlockBlockEntityRenderer_mixin implements BlockEntityRenderer<StructureBlockBlockEntity>
 {
-    @Inject(method = "method_33893", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "getRenderDistance", at = @At("HEAD"), cancellable = true)
     void newLimit(CallbackInfoReturnable<Integer> cir)
     {
         if (CarpetSettings.structureBlockOutlineDistance != 96)