diff --git a/src/body.rs b/src/body.rs
index 2763dd3..4d20a43 100644
--- a/src/body.rs
+++ b/src/body.rs
@@ -125,7 +125,7 @@ fn copy_chunked<R: Read, W: Write>(reader: &mut R, writer: &mut W) -> IoResult<u
         let header = header_str.as_bytes();
         assert!(header.len() <= CHUNK_HEADER_MAX_SIZE);
         let start_index = CHUNK_HEADER_MAX_SIZE - header.len();
-        (&mut chunk[start_index..]).write(&header).unwrap();
+        (&mut chunk[start_index..]).write_all(&header).unwrap();
 
         // And add the footer
         chunk.extend_from_slice(b"\r\n");
diff --git a/src/stream.rs b/src/stream.rs
index a3f91c5..9103022 100644
--- a/src/stream.rs
+++ b/src/stream.rs
@@ -252,13 +252,11 @@ pub(crate) fn connect_host(unit: &Unit, hostname: &str, port: u16) -> Result<Tcp
                 hostname,
                 port,
             )
+        } else if has_timeout {
+            let timeout = Duration::from_millis(timeout_connect);
+            TcpStream::connect_timeout(&sock_addr, timeout)
         } else {
-            if has_timeout {
-                let timeout = Duration::from_millis(timeout_connect);
-                TcpStream::connect_timeout(&sock_addr, timeout)
-            } else {
-                TcpStream::connect(&sock_addr)
-            }
+            TcpStream::connect(&sock_addr)
         };
 
         if let Ok(stream) = stream {
diff --git a/src/unit.rs b/src/unit.rs
index a3b4205..5046bf3 100644
--- a/src/unit.rs
+++ b/src/unit.rs
@@ -1,7 +1,6 @@
 use std::io::{Result as IoResult, Write};
 use std::sync::{Arc, Mutex};
 
-use base64;
 use qstring::QString;
 use url::Url;
 
diff --git a/tests/https-agent.rs b/tests/https-agent.rs
index 8d99d34..e17c559 100644
--- a/tests/https-agent.rs
+++ b/tests/https-agent.rs
@@ -47,7 +47,7 @@ fn agent_set_cookie() {
 }
 
 #[cfg(feature = "tls")]
-const BADSSL_CLIENT_CERT_PEM: &'static str = r#"Bag Attributes
+const BADSSL_CLIENT_CERT_PEM: &str = r#"Bag Attributes
     localKeyID: 41 C3 6C 33 C7 E3 36 DD EA 4A 1F C0 B7 23 B8 E6 9C DC D8 0F
 subject=C = US, ST = California, L = San Francisco, O = BadSSL, CN = BadSSL Client Certificate
 
@@ -119,12 +119,10 @@ fn tls_client_certificate() {
 
     let mut tls_config = rustls::ClientConfig::new();
 
-    let certs =
-        rustls::internal::pemfile::certs(&mut BADSSL_CLIENT_CERT_PEM.clone().as_bytes()).unwrap();
-    let key =
-        rustls::internal::pemfile::rsa_private_keys(&mut BADSSL_CLIENT_CERT_PEM.clone().as_bytes())
-            .unwrap()[0]
-            .clone();
+    let certs = rustls::internal::pemfile::certs(&mut BADSSL_CLIENT_CERT_PEM.as_bytes()).unwrap();
+    let key = rustls::internal::pemfile::rsa_private_keys(&mut BADSSL_CLIENT_CERT_PEM.as_bytes())
+        .unwrap()[0]
+        .clone();
 
     tls_config.set_single_client_cert(certs, key).unwrap();
     tls_config