diff --git a/build.gradle b/build.gradle
index 5b965a9e..3ad73d1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,15 +14,12 @@ plugins {
 	id 'com.github.johnrengelman.shadow' version '4.0.4'
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 16
+targetCompatibility = 16
 
 tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = "UTF-8"
-
-	if (JavaVersion.current().isJava9Compatible()) {
-		it.options.release = 8
-	}
+	it.options.release = 16
 }
 
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f371643e..e5338d37 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.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
index 82ecada7..d84e70fc 100644
--- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
+++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
@@ -25,7 +25,7 @@
 package net.fabricmc.loom.configuration;
 
 import org.gradle.api.Project;
-import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.ConfigurationContainer;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.SourceSet;
@@ -56,6 +56,7 @@ public final class CompileConfiguration {
 	}
 
 	public static void setupConfigurations(Project project) {
+		final ConfigurationContainer configurations = project.getConfigurations();
 		Configuration modCompileClasspathConfig = project.getConfigurations().maybeCreate(Constants.Configurations.MOD_COMPILE_CLASSPATH);
 		modCompileClasspathConfig.setTransitive(true);
 		Configuration modCompileClasspathMappedConfig = project.getConfigurations().maybeCreate(Constants.Configurations.MOD_COMPILE_CLASSPATH_MAPPED);
@@ -115,6 +116,22 @@ public final class CompileConfiguration {
 
 		LoomProjectData data = project.getExtensions().getByType(LoomGradleExtension.class).getProjectData();
 
+		data.createLazyConfiguration(Constants.Configurations.MOD_COMPILE_CLASSPATH).configure(configuration -> configuration.setTransitive(true));
+		data.createLazyConfiguration(Constants.Configurations.MOD_COMPILE_CLASSPATH_MAPPED).configure(configuration -> configuration.setTransitive(false));
+		data.createLazyConfiguration(Constants.Configurations.MINECRAFT_NAMED).configure(configuration -> configuration.setTransitive(false)); // The launchers do not recurse dependencies
+		data.createLazyConfiguration(Constants.Configurations.MINECRAFT_DEPENDENCIES).configure(configuration -> configuration.setTransitive(false));
+		data.createLazyConfiguration(Constants.Configurations.LOADER_DEPENDENCIES).configure(configuration -> configuration.setTransitive(false));
+		data.createLazyConfiguration(Constants.Configurations.MINECRAFT).configure(configuration -> configuration.setTransitive(false));
+		data.createLazyConfiguration(Constants.Configurations.INCLUDE).configure(configuration -> configuration.setTransitive(false)); // Dont get transitive deps
+		data.createLazyConfiguration(Constants.Configurations.MAPPING_CONSTANTS);
+
+		extendsFrom(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, Constants.Configurations.MAPPING_CONSTANTS, project);
+
+		data.createLazyConfiguration(Constants.Configurations.MAPPINGS);
+		data.createLazyConfiguration(Constants.Configurations.MAPPINGS_FINAL);
+		data.createLazyConfiguration(Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES);
+		data.createLazyConfiguration(Constants.Configurations.UNPICK_CLASSPATH);
+
 		for (RemappedConfigurationEntry entry : Constants.MOD_COMPILE_ENTRIES) {
 			data.createLazyConfiguration(entry.getSourceConfiguration())
 					.configure(configuration -> configuration.setTransitive(true));
@@ -123,7 +140,7 @@ public final class CompileConfiguration {
 			data.createLazyConfiguration(entry.getRemappedConfiguration())
 					.configure(configuration -> configuration.setTransitive(false));
 
-			extendsFrom(entry.getTargetConfiguration(project.getConfigurations()), entry.getRemappedConfiguration(), project);
+			extendsFrom(entry.getTargetConfiguration(configurations), entry.getRemappedConfiguration(), project);
 
 			if (entry.isOnModCompileClasspath()) {
 				extendsFrom(Constants.Configurations.MOD_COMPILE_CLASSPATH, entry.getSourceConfiguration(), project);
@@ -224,6 +241,6 @@ public final class CompileConfiguration {
 	}
 
 	private static void extendsFrom(String a, String b, Project project) {
-		project.getConfigurations().getByName(a).extendsFrom(project.getConfigurations().getByName(b));
+		project.getConfigurations().getByName(a, configuration -> configuration.extendsFrom(project.getConfigurations().getByName(b)));
 	}
 }
diff --git a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
index 4e60f381..56ed8c9c 100644
--- a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
@@ -28,8 +28,8 @@ import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
 
 trait ProjectTestTrait {
-	final static String DEFAULT_GRADLE = "7.0"
-	final static String PRE_RELEASE_GRADLE = "7.1-20210504162620+0000"
+	final static String DEFAULT_GRADLE = "7.0.1"
+	final static String PRE_RELEASE_GRADLE = "7.1-20210511220046+0000"
 
 	static File gradleHome = File.createTempDir()
 	File testProjectDir = File.createTempDir()