diff --git a/build.gradle b/build.gradle
index 7dc568576..5d8c65538 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,13 +7,19 @@ architectury {
     minecraft = rootProject.minecraft_version
 }
 
-subprojects {
+subprojects { p ->
     apply plugin: "dev.architectury.loom"
 
     loom {
         silentMojangMappingsLicense()
     }
 
+    configurations {
+        common
+        shadowMe
+        implementation.extendsFrom shadowMe
+    }
+
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
         // The following line declares the mojmap mappings
@@ -22,6 +28,12 @@ subprojects {
         // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
         // Do NOT use other classes from fabric loader unless working with fabric
         modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+
+
+        if (p != project(":core")) {
+            common(project(":core")) { transitive false }
+            shadowMe(project(":core")) { transitive false }
+        }
     }
 }
 
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 55365cd28..b9d311ce0 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -12,12 +12,9 @@ architectury {
 }
 
 configurations {
-    common
-    shadowMe // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentFabric.extendsFrom common
-    implementation.extendsFrom shadowMe
 }
 
 repositories {
@@ -47,9 +44,6 @@ dependencies {
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowMe(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
 
-    common(project(":core"))
-    shadowMe(project(":core"))
-
     common 'org.tukaani:xz:1.9'
     common 'org.apache.commons:commons-compress:1.21'
     shadowMe 'org.tukaani:xz:1.9'
diff --git a/forge/build.gradle b/forge/build.gradle
index 44ffab118..19eb66598 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -18,12 +18,9 @@ architectury {
 }
 
 configurations {
-    common
-    shadowMe // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentForge.extendsFrom common
-    implementation.extendsFrom shadowMe
 }
 
 dependencies {
@@ -32,9 +29,7 @@ dependencies {
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowMe(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
 
-    common(project(":core"))
-    shadowMe(project(":core"))
-    forgeDependencies(project(":core"))
+//    forgeDependencies(project(":core")) { transitive false }
 
     forgeDependencies('org.tukaani:xz:1.9')
     forgeDependencies('org.apache.commons:commons-compress:1.21')
diff --git a/forge/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java b/forge/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java
index db14114f0..aad81e5b3 100644
--- a/forge/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java
+++ b/forge/src/main/java/com/seibel/lod/forge/wrappers/world/WorldWrapper.java
@@ -33,6 +33,7 @@ import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.server.level.ServerChunkCache;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.LevelAccessor;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author James Seibel
@@ -59,9 +60,10 @@ public class WorldWrapper implements IWorldWrapper
 	}
 	
 	
-	
+	@Nullable
 	public static WorldWrapper getWorldWrapper(LevelAccessor world)
 	{
+		if (world == null) return null;
 		//first we check if the biome has already been wrapped
 		if(worldWrapperMap.containsKey(world) && worldWrapperMap.get(world) != null)
 			return worldWrapperMap.get(world);
diff --git a/gradle.properties b/gradle.properties
index 47e95e4e9..7a4afc28c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2048M
 
 minecraft_version=1.17.1
 
-archives_base_name=Distant-Horizons_1.17.1
+archives_base_name=DistantHorizons
 mod_version=1.5.3a
 maven_group=com.seibel.lod
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 69a971507..ffed3a254 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists