diff --git a/src/client/connector.rs b/src/client/connector.rs
index 88be77f9b..90a2e1c88 100644
--- a/src/client/connector.rs
+++ b/src/client/connector.rs
@@ -1335,4 +1335,9 @@ impl<Io: IoStream> IoStream for TlsStream<Io> {
     fn set_linger(&mut self, dur: Option<time::Duration>) -> io::Result<()> {
         self.get_mut().get_mut().set_linger(dur)
     }
+
+    #[inline]
+    fn set_keepalive(&mut self, dur: Option<time::Duration>) -> io::Result<()> {
+        self.get_mut().get_mut().set_keepalive(dur)
+    }
 }
diff --git a/src/server/h1.rs b/src/server/h1.rs
index 6875972ee..fe8f976b7 100644
--- a/src/server/h1.rs
+++ b/src/server/h1.rs
@@ -98,7 +98,7 @@ where
             (settings.now(), None)
         };
 
-        let mut flags = if is_eof {
+        let flags = if is_eof {
             Flags::READ_DISCONNECTED
         } else if settings.keep_alive_enabled() {
             Flags::KEEPALIVE | Flags::KEEPALIVE_ENABLED
@@ -664,6 +664,9 @@ mod tests {
         fn set_linger(&mut self, _: Option<time::Duration>) -> io::Result<()> {
             Ok(())
         }
+        fn set_keepalive(&mut self, _: Option<time::Duration>) -> io::Result<()> {
+            Ok(())
+        }
     }
     impl io::Write for Buffer {
         fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
diff --git a/src/server/service.rs b/src/server/service.rs
index 89a58af75..231ac599e 100644
--- a/src/server/service.rs
+++ b/src/server/service.rs
@@ -88,12 +88,15 @@ where
         Ok(Async::Ready(()))
     }
 
-    fn call(&mut self, mut req: Self::Request) -> Self::Future {
+    fn call(&mut self, req: Self::Request) -> Self::Future {
         HttpChannel::new(self.settings.clone(), req, None)
     }
 }
 
 /// `NewService` implementation for stream configuration service
+///
+/// Stream configuration service allows to change some socket level
+/// parameters. for example `tcp nodelay` or `tcp keep-alive`.
 pub struct StreamConfiguration<T, E> {
     no_delay: Option<bool>,
     tcp_ka: Option<Option<Duration>>,
@@ -141,6 +144,9 @@ impl<T: IoStream, E> NewService for StreamConfiguration<T, E> {
 }
 
 /// Stream configuration service
+///
+/// Stream configuration service allows to change some socket level
+/// parameters. for example `tcp nodelay` or `tcp keep-alive`.
 pub struct StreamConfigurationService<T, E> {
     no_delay: Option<bool>,
     tcp_ka: Option<Option<Duration>>,
diff --git a/src/server/ssl/openssl.rs b/src/server/ssl/openssl.rs
index 99ca40e03..f9e0e1774 100644
--- a/src/server/ssl/openssl.rs
+++ b/src/server/ssl/openssl.rs
@@ -23,7 +23,7 @@ impl<T: AsyncRead + AsyncWrite> OpensslAcceptor<T> {
 
     /// Create `OpensslAcceptor` with custom server flags.
     pub fn with_flags(
-        mut builder: SslAcceptorBuilder, flags: ServerFlags,
+        builder: SslAcceptorBuilder, flags: ServerFlags,
     ) -> io::Result<ssl::OpensslAcceptor<T>> {
         let acceptor = openssl_acceptor_with_flags(builder, flags)?;