diff --git a/build.gradle.kts b/build.gradle.kts
index 1763fee45..c02c906ec 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,6 +11,11 @@ allprojects {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
+
+    tasks.withType<JavaCompile> {
+        options.compilerArgs.add("-Xlint:unchecked")
+        options.isDeprecation = true
+    }
 }
 
 val testDependencies by configurations.creating {
diff --git a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/instrumentation/hypertrace/grpc/v1_5/GrpcSpanDecorator.java b/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/instrumentation/hypertrace/grpc/v1_5/GrpcSpanDecorator.java
index 04732d0e8..3bc66b8d2 100644
--- a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/instrumentation/hypertrace/grpc/v1_5/GrpcSpanDecorator.java
+++ b/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/instrumentation/hypertrace/grpc/v1_5/GrpcSpanDecorator.java
@@ -71,7 +71,7 @@ public static void addMetadataAttributes(
   }
 
   public static Map<String, String> metadataToMap(Metadata metadata) {
-    Map<String, String> mapHeaders = new LinkedHashMap(metadata.keys().size());
+    Map<String, String> mapHeaders = new LinkedHashMap<>(metadata.keys().size());
     for (String key : metadata.keys()) {
       if (key.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
         continue;
diff --git a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerInterceptor.java b/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerInterceptor.java
index 6e518043e..8b63cf460 100644
--- a/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerInterceptor.java
+++ b/instrumentation/grpc-1.5/src/main/java/io/opentelemetry/instrumentation/hypertrace/grpc/v1_5/server/GrpcServerInterceptor.java
@@ -56,7 +56,9 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
         FilterProvider.getFilterEvaluator().evaluateRequestHeaders(currentSpan, mapHeaders);
     if (filterResult.blockExecution()) {
       call.close(Status.PERMISSION_DENIED, new Metadata());
-      return NoopServerCallListener.INSTANCE;
+      @SuppressWarnings("unchecked")
+      ServerCall.Listener<ReqT> noop = NoopServerCallListener.INSTANCE;
+      return noop;
     }
 
     Listener<ReqT> serverCall = next.startCall(new TracingServerCall<>(call, currentSpan), headers);
diff --git a/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v2_3/Servlet2BodyInstrumentation.java b/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v2_3/Servlet2BodyInstrumentation.java
index c6121973d..5441d1412 100644
--- a/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v2_3/Servlet2BodyInstrumentation.java
+++ b/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v2_3/Servlet2BodyInstrumentation.java
@@ -159,6 +159,7 @@ public static Object start(
       ServletSpanDecorator.addSessionId(currentSpan, httpRequest);
 
       // set request headers
+      @SuppressWarnings("unchecked")
       Enumeration<String> headerNames = httpRequest.getHeaderNames();
       Map<String, String> headers = new HashMap<>();
       while (headerNames.hasMoreElements()) {