diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
index 3a9aa0be71..059feb96bd 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
@@ -42,6 +42,7 @@ public class AgentInstaller {
         new AgentBuilder.Default()
             .disableClassFormatChanges()
             .with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
+            .with(AgentBuilder.DescriptionStrategy.Default.POOL_ONLY)
             .with(new LoggingListener())
             .with(new DDLocationStrategy())
             .ignore(any(), skipClassLoader())
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceMatcher.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceMatcher.java
index 807af39d6f..3a6a25bf5f 100644
--- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceMatcher.java
+++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceMatcher.java
@@ -21,11 +21,11 @@ public class ReferenceMatcher {
   private final Reference[] references;
   private final Set<String> helperClassNames;
 
-  public ReferenceMatcher(Reference... references) {
+  public ReferenceMatcher(final Reference... references) {
     this(new String[0], references);
   }
 
-  public ReferenceMatcher(String[] helperClassNames, Reference[] references) {
+  public ReferenceMatcher(final String[] helperClassNames, final Reference[] references) {
     this.references = references;
     this.helperClassNames = new HashSet<>(Arrays.asList(helperClassNames));
   }
@@ -34,7 +34,7 @@ public class ReferenceMatcher {
    * @param loader Classloader to validate against (or null for bootstrap)
    * @return true if all references match the classpath of loader
    */
-  public boolean matches(ClassLoader loader) {
+  public boolean matches(final ClassLoader loader) {
     return getMismatchedReferenceSources(loader).size() == 0;
   }
 
@@ -52,7 +52,7 @@ public class ReferenceMatcher {
         mismatches = mismatchCache.get(loader);
         if (null == mismatches) {
           mismatches = new ArrayList<>(0);
-          for (Reference reference : references) {
+          for (final Reference reference : references) {
             // Don't reference-check helper classes.
             // They will be injected by the instrumentation's HelperInjector.
             if (!helperClassNames.contains(reference.getClassName())) {