diff --git a/src/java/org/eclipse/jetty/server/Request.java b/src/java/org/eclipse/jetty/server/Request.java
index 4b8c1d4..5ee3717 100644
--- a/src/java/org/eclipse/jetty/server/Request.java
+++ b/src/java/org/eclipse/jetty/server/Request.java
@@ -2185,7 +2185,7 @@
                         Object values = entry.getValue();
                         for (int i = 0; i < LazyList.size(values); i++)
                         {
-                            overridden_query_string.append("&").append(name).append("=").append(LazyList.get(values,i));
+                            overridden_query_string.append("&").append(name).append("=").append(LazyList.<String>get(values,i));
                         }
                     }
                 }
diff --git a/src/java/org/eclipse/jetty/server/handler/ContextHandler.java b/src/java/org/eclipse/jetty/server/handler/ContextHandler.java
index 16dec37..0f15749 100644
--- a/src/java/org/eclipse/jetty/server/handler/ContextHandler.java
+++ b/src/java/org/eclipse/jetty/server/handler/ContextHandler.java
@@ -2331,7 +2331,8 @@
             
             try
             {
-                Class<? extends EventListener> clazz = _classLoader==null?Loader.loadClass(ContextHandler.class,className):_classLoader.loadClass(className);
+                @SuppressWarnings({ "unchecked", "rawtypes" })
+                Class<? extends EventListener> clazz = _classLoader==null?Loader.loadClass(ContextHandler.class,className):(Class)_classLoader.loadClass(className);
                 addListener(clazz);
             }
             catch (ClassNotFoundException e)