diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java
index c3ce395ba..ee6727344 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java
@@ -72,8 +72,13 @@ import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 #endif
 #endif
 
+#if MC_1_16_5 || MC_1_17_1
+import net.minecraft.world.level.material.Fluids;
+#endif
+
 import net.minecraft.world.level.material.Fluid;
 
+
 public class ChunkLoader
 {
 	#if POST_MC_1_19_2
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DummyLightEngine.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DummyLightEngine.java
index 2aca9d6ca..cd8fa5e0c 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DummyLightEngine.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DummyLightEngine.java
@@ -44,7 +44,7 @@ public class DummyLightEngine extends LevelLightEngine
 	public void onBlockEmissionIncrease(BlockPos blockPos, int i) { }
 	
 	@Override
-	public int runUpdates(int i, boolean bl, boolean bl2) { }
+	public int runUpdates(int i, boolean bl, boolean bl2) { return 0; }
 	
 	@Override
 	public void enableLightSources(ChunkPos chunkPos, boolean bl) { }
diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkMap.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkMap.java
index 7d9549cff..565b5aeb7 100644
--- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkMap.java
+++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkMap.java
@@ -31,7 +31,7 @@ public class MixinChunkMap
 	@Inject(method = "save", at = @At(value = "INVOKE", target = CHUNK_SERIALIZER_WRITE))
 	private void onChunkSave(ChunkAccess chunk, CallbackInfoReturnable<Boolean> ci)
 	{
-		#if MC_1_16_5
+		#if MC_1_16_5 || MC_1_17_1
 		if (chunk.getBiomes() == null)
 		{
 			// in 1.16.5 some chunks may be missing their biomes, which cause issues when attempting to save them