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 030eab28a1..fa046dda0f 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
@@ -112,6 +112,7 @@ public class AgentInstaller {
             .or(nameStartsWith("org.aspectj."))
             .or(nameStartsWith("org.groovy."))
             .or(nameStartsWith("org.codehaus.groovy.macro."))
+            .or(nameStartsWith("com.intellij.rt.debugger."))
             .or(nameStartsWith("com.p6spy."))
             .or(nameStartsWith("com.newrelic."))
             .or(nameContains("javassist"))
@@ -181,7 +182,7 @@ public class AgentInstaller {
         final JavaModule module,
         final boolean loaded,
         final DynamicType dynamicType) {
-      log.debug("Transformed {} -- {}", typeDescription, classLoader);
+      log.debug("Transformed {} -- {}", typeDescription.getName(), classLoader);
     }
 
     @Override
@@ -189,21 +190,27 @@ public class AgentInstaller {
         final TypeDescription typeDescription,
         final ClassLoader classLoader,
         final JavaModule module,
-        final boolean loaded) {}
+        final boolean loaded) {
+      //      log.debug("onIgnored {}", typeDescription.getName());
+    }
 
     @Override
     public void onComplete(
         final String typeName,
         final ClassLoader classLoader,
         final JavaModule module,
-        final boolean loaded) {}
+        final boolean loaded) {
+      //      log.debug("onComplete {}", typeName);
+    }
 
     @Override
     public void onDiscovery(
         final String typeName,
         final ClassLoader classLoader,
         final JavaModule module,
-        final boolean loaded) {}
+        final boolean loaded) {
+      //      log.debug("onDiscovery {}", typeName);
+    }
   }
 
   /**
diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/AdviceUtils.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/AdviceUtils.java
index 2eea386ddb..7ac6355423 100644
--- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/AdviceUtils.java
+++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/AdviceUtils.java
@@ -3,8 +3,10 @@ package datadog.trace.instrumentation.java.concurrent;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.instrumentation.java.concurrent.State;
 import datadog.trace.context.TraceScope;
+import lombok.extern.slf4j.Slf4j;
 
 /** Helper utils for Runnable/Callable instrumentation */
+@Slf4j
 public class AdviceUtils {
 
   /**
diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/JavaExecutorInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/JavaExecutorInstrumentation.java
index 0cb9bfaa6b..23f5e8a223 100644
--- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/JavaExecutorInstrumentation.java
+++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/JavaExecutorInstrumentation.java
@@ -23,12 +23,10 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.Future;
-import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-@Slf4j
 @AutoService(Instrumenter.class)
 public final class JavaExecutorInstrumentation extends AbstractExecutorInstrumentation {
 
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 0305045113..75d9387cd4 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -14,7 +14,7 @@ ext {
     junit      : "4.12",
     logback    : "1.2.3",
     lombok     : "1.18.4",
-    bytebuddy  : "1.9.9",
+    bytebuddy  : "1.9.12",
     scala      : "2.11.12",  // Last version to support Java 7 (2.12+ require Java 8+)
     kotlin     : "1.3.11",
     coroutines : "1.1.0"