diff --git a/gradle.properties b/gradle.properties
index 2b893886..36799822 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
 	minecraft_version=20w09a
-	yarn_mappings=20w09a+build.2
+	yarn_mappings=20w09a+build.6
 	loader_version=0.7.8+build.184
 
 # Mod Properties
diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java
index 19baf5e3..3129ee10 100644
--- a/src/main/java/carpet/helpers/FeatureGenerator.java
+++ b/src/main/java/carpet/helpers/FeatureGenerator.java
@@ -269,8 +269,8 @@ public class FeatureGenerator
                         :simplePlop(Feature.CORAL_CLAW).plop(w, p));
         put("sea_pickle", simplePlop(Feature.SEA_PICKLE.configure( new SeaPickleFeatureConfig(20))));
         put("boulder", simplePlop(Feature.FOREST_ROCK.configure( new BoulderFeatureConfig(Blocks.MOSSY_COBBLESTONE.getDefaultState(), 0))));
-        put("crimson_fungus", simplePlop(Feature.HUGE_FUNGUS.configure(HugeFungiFeatureConfig.field_22432)));
-        put("warped_fungus", simplePlop(Feature.HUGE_FUNGUS.configure(HugeFungiFeatureConfig.field_22434)));
+        put("crimson_fungus", simplePlop(Feature.HUGE_FUNGUS.configure(HugeFungusFeatureConfig.field_22432)));
+        put("warped_fungus", simplePlop(Feature.HUGE_FUNGUS.configure(HugeFungusFeatureConfig.field_22434)));
         put("nether_sprouts", simplePlop(Feature.NETHER_FOREST_VEGETATION.configure(DefaultBiomeFeatures.NETHER_SPROUTS_CONFIG)));
         put("crimson_roots", simplePlop(Feature.NETHER_FOREST_VEGETATION.configure(DefaultBiomeFeatures.CRIMSON_ROOTS_CONFIG)));
         put("warped_roots", simplePlop(Feature.NETHER_FOREST_VEGETATION.configure(DefaultBiomeFeatures.WARPED_ROOTS_CONFIG)));
diff --git a/src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java b/src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java
index 26fa426b..b40876a7 100644
--- a/src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java
+++ b/src/main/java/carpet/mixins/Structure_fillUpdatesMixin.java
@@ -25,10 +25,10 @@ public class Structure_fillUpdatesMixin
 
     @Redirect(method = "method_15172", at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/structure/StructurePlacementData;method_16444()Z"
+            target = "Lnet/minecraft/structure/StructurePlacementData;shouldUpdateNeighbors()Z"
     ))
     private boolean skipPostprocess(StructurePlacementData structurePlacementData)
     {
-        return structurePlacementData.method_16444() || CarpetSettings.impendingFillSkipUpdates;
+        return structurePlacementData.shouldUpdateNeighbors() || CarpetSettings.impendingFillSkipUpdates;
     }
 }
diff --git a/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java b/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java
index 94a01502..346fd2f0 100644
--- a/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java
+++ b/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java
@@ -138,7 +138,7 @@ public abstract class VillagerEntity_aiMixin extends AbstractTraderEntity
             }
             else if (itemStack_1.getItem() instanceof BedItem)
             {
-                List<PointOfInterest> list_1 = ((ServerWorld) getEntityWorld()).getPointOfInterestStorage().get(
+                List<PointOfInterest> list_1 = ((ServerWorld) getEntityWorld()).getPointOfInterestStorage().getInCircle(
                         type -> type == PointOfInterestType.HOME,
                         getBlockPos(),
                         48, PointOfInterestStorage.OccupationStatus.ANY).collect(Collectors.toList());
diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java
index 7b1a678d..7d01c39f 100644
--- a/src/main/java/carpet/script/CarpetExpression.java
+++ b/src/main/java/carpet/script/CarpetExpression.java
@@ -914,7 +914,7 @@ public class CarpetExpression
                 // this feels wrong, but I don't want to mix-in more than I really need to.
                 // also distance adds 0.5 to each point which screws up accurate distance calculations
                 // you shoudn't be using POI with that in mind anyways, so I am not worried about it.
-                PointOfInterest poi = store.get(
+                PointOfInterest poi = store.getInCircle(
                         poiType.getCompletionCondition(),
                         pos,
                         1,
@@ -953,7 +953,7 @@ public class CarpetExpression
                     return LazyValue.NULL;
             }
 
-            Value ret = ListValue.wrap(store.get(condition, pos, (int)radius, status).map( p ->
+            Value ret = ListValue.wrap(store.getInCircle(condition, pos, (int)radius, status).map( p ->
                     ListValue.of(
                             new StringValue(p.getType().toString()),
                             new NumericValue(p.getType().getTicketCount() - ((PointOfInterest_scarpetMixin)p).getFreeTickets()),
@@ -1000,7 +1000,7 @@ public class CarpetExpression
             if (occupancy > 0)
             {
                 int finalO = occupancy;
-                store.get((tt) -> tt==type, pos, 1, PointOfInterestStorage.OccupationStatus.ANY
+                store.getInSquare((tt) -> tt==type, pos, 1, PointOfInterestStorage.OccupationStatus.ANY
                 ).filter(p -> p.getPos().equals(pos)).findFirst().ifPresent(p -> {
                     for (int i=0; i < finalO; i++) ((PointOfInterest_scarpetMixin)p).callReserveTicket();
                 });
diff --git a/src/main/java/carpet/utils/BlockInfo.java b/src/main/java/carpet/utils/BlockInfo.java
index 8c2b2ea9..bd0e1b16 100644
--- a/src/main/java/carpet/utils/BlockInfo.java
+++ b/src/main/java/carpet/utils/BlockInfo.java
@@ -47,7 +47,7 @@ public class BlockInfo
         put(BlockSoundGroup.LANTERN , "lantern" );
         put(BlockSoundGroup.NETHER_STEM, "fungi_stem");
         put(BlockSoundGroup.NYLIUM, "nylium");
-        put(BlockSoundGroup.FUNGI, "fungi");
+        put(BlockSoundGroup.FUNGUS, "fungus");
         put(BlockSoundGroup.ROOTS, "roots");
         put(BlockSoundGroup.SHROOMLIGHT, "shroomlight");
         put(BlockSoundGroup.WEEPING_VINES, "weeping_vines");