diff --git a/src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs b/src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs
index 2d2de23113..5b87d873a3 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Http/Listener.cs
@@ -50,15 +50,16 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
         /// </summary>
         protected abstract UvStreamHandle CreateListenSocket(string host, int port);
 
-        protected void ConnectionCallback(UvStreamHandle stream, int status, Exception error, object state)
+        protected static void ConnectionCallback(UvStreamHandle stream, int status, Exception error, object state)
         {
+            var listener = (Listener) state;
             if (error != null)
             {
-                Log.LogError("Listener.ConnectionCallback ", error);
+                listener.Log.LogError("Listener.ConnectionCallback ", error);
             }
             else
             {
-                ((Listener)state).OnConnection(stream, status);
+                listener.OnConnection(stream, status);
             }
         }
 
diff --git a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvConnectRequest.cs b/src/Microsoft.AspNet.Server.Kestrel/Networking/UvConnectRequest.cs
index bbc94bc2dc..503cc7dfe7 100644
--- a/src/Microsoft.AspNet.Server.Kestrel/Networking/UvConnectRequest.cs
+++ b/src/Microsoft.AspNet.Server.Kestrel/Networking/UvConnectRequest.cs
@@ -43,7 +43,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Networking
             Libuv.pipe_connect(this, pipe, name, _uv_connect_cb);
         }
 
-        private  static void UvConnectCb(IntPtr ptr, int status)
+        private static void UvConnectCb(IntPtr ptr, int status)
         {
             var req = FromIntPtr<UvConnectRequest>(ptr);
             req.Unpin();