diff --git a/build_shared.gradle b/build_shared.gradle
index 203f723fb0..acbd383f80 100644
--- a/build_shared.gradle
+++ b/build_shared.gradle
@@ -44,6 +44,7 @@ tasks.withType(JavaCompile).configureEach {
     dependsOn 'processResources' // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
     options.warnings = false // Shutup deprecated for removal warnings
+    options.forkOptions.jvmArgs += '-Xmx3G' // Needed to make compiling faster, and not run out of heap space in some cases.
 }
 
 // Merge the resources and classes into the same directory. We'll need to split them at runtime because
diff --git a/settings.gradle b/settings.gradle
index f91e815336..6b7d7c87d7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -34,7 +34,7 @@ dependencyResolutionManagement {
             library('typetools', 'net.jodah:typetools:0.6.3') // Needed by EventBus because of lambdas
             library('mergetool-api', 'net.minecraftforge:mergetool-api:1.0')
 
-            library('mixin', 'org.spongepowered:mixin:0.8.5')
+            library('mixin', 'org.spongepowered:mixin:0.8.7')
             library('nulls', 'org.jetbrains:annotations:24.1.0') // Got to have our null annotations!
             library('slf4j-api', 'org.slf4j:slf4j-api:2.0.7')
             library('maven-artifact', 'org.apache.maven:maven-artifact:3.8.5')