diff --git a/BUILDING.md b/BUILDING.md
index 4332ec13b5e..b226da6805a 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -60,7 +60,7 @@ Requirements to build the full project:
 
 ### Install the required JDKs
 
-Download and install Eclipse Temurin JDK versions 8, 11, 17 and 21, and GraalVM 17.
+Download and install JDK versions 8, 11, 17 and 21, and GraalVM 17 for your OS.
 
 #### macOS
 
@@ -179,17 +179,17 @@ scoop install git
 
 #### macOS
 
-Download and install Docker Desktop from the offical website:<br/>
+Download and install Docker Desktop from the official website:<br/>
 https://docs.docker.com/desktop/setup/install/mac-install/
 
 #### Linux
 
-Download and install Docker Desktop from the offical website:<br/>
+Download and install Docker Desktop from the official website:<br/>
 https://docs.docker.com/desktop/setup/install/linux/
 
 #### Windows
 
-Download and install Docker Desktop from the offical website:<br/>
+Download and install Docker Desktop from the official website:<br/>
 https://docs.docker.com/desktop/setup/install/windows-install/
 
 <details>
diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle
index e4926474406..363d4094ee7 100644
--- a/dd-java-agent/agent-iast/build.gradle
+++ b/dd-java-agent/agent-iast/build.gradle
@@ -15,8 +15,8 @@ java {
   toolchain {
     languageVersion.set(JavaLanguageVersion.of(11))
   }
-  sourceCompatibility = 1.8
-  targetCompatibility = 1.8
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 tasks.withType(AbstractCompile).configureEach {
diff --git a/dd-java-agent/benchmark-integration/build.gradle b/dd-java-agent/benchmark-integration/build.gradle
index 45e879ff667..4fddd6288fe 100644
--- a/dd-java-agent/benchmark-integration/build.gradle
+++ b/dd-java-agent/benchmark-integration/build.gradle
@@ -25,8 +25,8 @@ apply from: "$rootDir/gradle/java.gradle"
 
 description = 'Integration Level Agent benchmarks.'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 subprojects { sub ->
   sub.apply plugin: 'com.gradleup.shadow'
diff --git a/dd-java-agent/instrumentation/javax-xml/build.gradle b/dd-java-agent/instrumentation/javax-xml/build.gradle
index 0433121e047..c8184893309 100644
--- a/dd-java-agent/instrumentation/javax-xml/build.gradle
+++ b/dd-java-agent/instrumentation/javax-xml/build.gradle
@@ -14,6 +14,13 @@ repositories {
   }
 }
 
+configurations.all {
+  // shut up about broken xml-api pom relocation
+  resolutionStrategy {
+    force 'xml-apis:xml-apis:1.4.01'
+  }
+}
+
 dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
   testImplementation group: 'xalan', name: 'xalan', version: '2.7.0'
diff --git a/dd-java-agent/instrumentation/owasp-esapi-2/build.gradle b/dd-java-agent/instrumentation/owasp-esapi-2/build.gradle
index 01d0a112cee..219dfaa0923 100644
--- a/dd-java-agent/instrumentation/owasp-esapi-2/build.gradle
+++ b/dd-java-agent/instrumentation/owasp-esapi-2/build.gradle
@@ -7,6 +7,13 @@ muzzle {
   }
 }
 
+configurations.all {
+  // shut up about broken xml-api pom relocation
+  resolutionStrategy {
+    force 'xml-apis:xml-apis:1.4.01'
+  }
+}
+
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: 'call-site-instrumentation'