diff --git a/build.gradle.kts b/build.gradle.kts
index 2ac95ca..410d2bb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -56,6 +56,10 @@ allprojects {
         jar {
             manifest.attributes("Implementation-Version" to provider { project.version })
         }
+
+        withType<net.fabricmc.loom.task.AbstractRemapJarTask> {
+            remapperIsolation.set(false)
+        }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 88763b5..6ae59d2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,10 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx3G
+org.gradle.jvmargs=-Xmx4G
+org.gradle.parallel=true
 
 loom.platform=forge
+fabric.loom.multiProjectOptimisation=true
 
 # Versions
 versionMc=1.20.1