ring.diff

diff --git a/ring-jetty-adapter/src/ring/adapter/jetty.clj b/ring-jetty-adapter/src/ring/adapter/jetty.clj
index b1a3f32..de12c1b 100644
--- a/ring-jetty-adapter/src/ring/adapter/jetty.clj
+++ b/ring-jetty-adapter/src/ring/adapter/jetty.clj
@@ -29,7 +29,7 @@
 
 (defn- ^AbstractHandler async-proxy-handler [handler]
   (proxy [AbstractHandler] []
-    (handle [_ ^Request base-request request ^HttpServletResponse response]
+    (handle [_ ^Request base-request ^HttpServletRequest request ^HttpServletResponse response]
       (let [^AsyncContext context (.startAsync request)]
         (handler
          (servlet/build-request-map request)
@@ -40,7 +40,7 @@
            (.complete context)))
         (.setHandled base-request true)))))
 
-(defn- ^ServerConnector server-connector [server & factories]
+(defn- ^ServerConnector server-connector [^Server server & factories]
   (ServerConnector. server (into-array ConnectionFactory factories)))
 
 (defn- ^HttpConfiguration http-config [options]
diff --git a/ring-servlet/src/ring/util/servlet.clj b/ring-servlet/src/ring/util/servlet.clj
index b3cf301..2690797 100644
--- a/ring-servlet/src/ring/util/servlet.clj
+++ b/ring-servlet/src/ring/util/servlet.clj
@@ -84,8 +84,9 @@
     (.getOutputStream response)
     (proxy [java.io.FilterOutputStream] [(.getOutputStream response)]
       (close []
-        (proxy-super close)
-        (.complete context)))))
+        (let [^java.io.FilterOutputStream this this]
+          (proxy-super close)
+          (.complete context))))))
 
 (defn update-servlet-response
   "Update the HttpServletResponse using a response map. Takes an optional
@@ -113,7 +114,7 @@
         (->> (update-servlet-response response)))))
 
 (defn- make-async-service-method [handler]
-  (fn [servlet request ^HttpServletResponse response]
+  (fn [servlet ^HttpServletRequest request ^HttpServletResponse response]
     (let [^AsyncContext context (.startAsync request)]
       (handler
        (-> request