diff --git a/src/main/java/gr/gousiosg/javacg/dyn/Instrumenter.java b/src/main/java/gr/gousiosg/javacg/dyn/Instrumenter.java
index f04690c0..2fbc698c 100644
--- a/src/main/java/gr/gousiosg/javacg/dyn/Instrumenter.java
+++ b/src/main/java/gr/gousiosg/javacg/dyn/Instrumenter.java
@@ -101,7 +101,7 @@ public static void premain(String argument, Instrumentation instrumentation) {
         instrumentation.addTransformer(new Instrumenter());
     }
 
-    public byte[] transform(ClassLoader loader, String className, Class clazz,
+    public byte[] transform(ClassLoader loader, String className, Class<?> clazz,
             java.security.ProtectionDomain domain, byte[] bytes) {
         boolean enhanceClass = false;
 
diff --git a/src/main/java/gr/gousiosg/javacg/dyn/Pair.java b/src/main/java/gr/gousiosg/javacg/dyn/Pair.java
index 2328b075..08483473 100644
--- a/src/main/java/gr/gousiosg/javacg/dyn/Pair.java
+++ b/src/main/java/gr/gousiosg/javacg/dyn/Pair.java
@@ -27,7 +27,7 @@ public boolean equals(Object obj) {
         if (obj.getClass() != getClass())
             return false;
 
-        Pair p = (Pair)obj;
+        Pair<?, ?> p = (Pair<?, ?>)obj;
 
         return first.equals(p.first) && second.equals(p.second);
     }