diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java
index d0e9c9a9e..72e8cee5c 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java
@@ -18,7 +18,6 @@
  */
 package com.seibel.distanthorizons.common.wrappers.chunk;
 
-import com.google.gson.internal.NonNullElementWrapperList;
 import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
 import com.seibel.distanthorizons.common.wrappers.misc.MutableBlockPosWrapper;
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/chunkFileHandling/ChunkFileReader.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/chunkFileHandling/ChunkFileReader.java
index ee344339a..d1dc68445 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/chunkFileHandling/ChunkFileReader.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/chunkFileHandling/ChunkFileReader.java
@@ -38,10 +38,17 @@ import net.minecraft.core.registries.Registries;
 import net.minecraft.world.level.chunk.ChunkStatus;
 #elif MC_VER <= MC_1_20_6
 import net.minecraft.core.registries.Registries;
+#elif MC_VER <= MC_1_21_3
+import net.minecraft.core.registries.Registries;
 import net.minecraft.world.level.chunk.ChunkStatus;
-#elif MC_VER <= MC_1_21_9
+#elif MC_VER <= MC_1_21_3
 import net.minecraft.core.registries.Registries;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
+#elif MC_VER <= MC_1_21_8
+import net.minecraft.core.registries.Registries;
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+#elif MC_VER <= MC_1_21_9
+import net.minecraft.world.level.chunk.PalettedContainerFactory;
 #else
 import net.minecraft.world.level.chunk.PalettedContainerFactory;
 #endif
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/params/ThreadWorldGenParams.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/params/ThreadWorldGenParams.java
index 82905556f..00944a550 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/params/ThreadWorldGenParams.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/params/ThreadWorldGenParams.java
@@ -112,7 +112,7 @@ public final class ThreadWorldGenParams
 	private StructureCheck createStructureCheck(GlobalWorldGenParams param)
 	{
 		return new StructureCheck(param.chunkScanner, param.registry, param.structures,
-				param.level.dimension(), param.generator, this.level, param.generator.getBiomeSource(), param.worldSeed,
+				param.mcServerLevel.dimension(), param.generator, this.level, param.generator.getBiomeSource(), param.worldSeed,
 				param.dataFixer);
 	}
 	#else
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java
index 271fe1c05..340bbf683 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java
@@ -102,7 +102,7 @@ public final class StepStructureStart extends AbstractWorldGenStep
 					this.environment.globalParams.worldSeed);
 			#elif MC_VER <= MC_1_21_3
 			this.environment.globalParams.generator.createStructures(this.environment.globalParams.registry,
-					this.environment.globalParams.level.getChunkSource().getGeneratorState(),
+					this.environment.globalParams.mcServerLevel.getChunkSource().getGeneratorState(),
 					tParams.structFeatManager, chunk, this.environment.globalParams.structures);
 			#else
 			this.environment.globalParams.generator.createStructures(this.environment.globalParams.registry,