diff --git a/dd-java-agent/README.md b/dd-java-agent/README.md
index c8e399d88b..b74c8032cc 100644
--- a/dd-java-agent/README.md
+++ b/dd-java-agent/README.md
@@ -93,7 +93,7 @@ When attached to an application the `dd-java-agent` automatically instruments th
 | FWK        | Versions           | Comments  |
 | ------------- |:-------------:| ----- |
 | OkHTTP | 3.x | HTTP client calls with [cross-process](http://opentracing.io/documentation/pages/api/cross-process-tracing.html) headers |
-| Apache HTTP Client | 4.x |HTTP client calls with [cross-process](http://opentracing.io/documentation/pages/api/cross-process-tracing.html) headers|
+| Apache HTTP Client | 4.3 + |HTTP client calls with [cross-process](http://opentracing.io/documentation/pages/api/cross-process-tracing.html) headers|
 | AWS SDK | 1.x | Trace all client calls to any AWS service |
 | Web Servlet Filters| Depending on server | See [Servers](#servers) section |
 
diff --git a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/TraceAnnotationsManager.java b/dd-java-agent/src/main/java/io/opentracing/contrib/agent/TraceAnnotationsManager.java
index b3c7d1e46c..a0b5eca26b 100644
--- a/dd-java-agent/src/main/java/io/opentracing/contrib/agent/TraceAnnotationsManager.java
+++ b/dd-java-agent/src/main/java/io/opentracing/contrib/agent/TraceAnnotationsManager.java
@@ -97,11 +97,14 @@ public class TraceAnnotationsManager {
 				}
 			}
 		}
-		StringWriter sw = new StringWriter();
-		try(PrintWriter pr = new PrintWriter(sw)){
-			transformer.removeScripts(new ArrayList<String>(rulesToRemove), pr);
+		
+		if(!rulesToRemove.isEmpty()){
+			StringWriter sw = new StringWriter();
+			try(PrintWriter pr = new PrintWriter(sw)){
+				transformer.removeScripts(new ArrayList<String>(rulesToRemove), pr);
+			}
+			log.log(Level.INFO, sw.toString());
 		}
-		log.log(Level.INFO, sw.toString());
 	}
 
 	/**
diff --git a/dd-java-agent/src/main/resources/dd-trace-authorized-versions.yaml b/dd-java-agent/src/main/resources/dd-trace-authorized-versions.yaml
index 265334d12a..65dc77d772 100644
--- a/dd-java-agent/src/main/resources/dd-trace-authorized-versions.yaml
+++ b/dd-java-agent/src/main/resources/dd-trace-authorized-versions.yaml
@@ -3,7 +3,10 @@ okhttp:
   valid_versions: 3\..*
 httpclient:
   key: apache http
-  valid_versions: 4\..*
+  valid_versions: 4\.[3|4|5]\..*
+commons-httpclient:
+  key: apache http
+  valid_versions: none
 aws-java-sdk:
   key: aws
   valid_versions: 1\..*
diff --git a/dd-trace-examples/dropwizard-mongo-client/pom.xml b/dd-trace-examples/dropwizard-mongo-client/pom.xml
index 9ce9b9e260..596e83023a 100644
--- a/dd-trace-examples/dropwizard-mongo-client/pom.xml
+++ b/dd-trace-examples/dropwizard-mongo-client/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <!-- Datadog version -->
-        <dd-trace.version>0.0.3-SNAPSHOT</dd-trace.version>
+        <dd-trace.version>0.0.3</dd-trace.version>
     </properties>