diff --git a/actix-router/Cargo.toml b/actix-router/Cargo.toml
index 6fc6ecc8..74e5fdab 100644
--- a/actix-router/Cargo.toml
+++ b/actix-router/Cargo.toml
@@ -20,7 +20,7 @@ default = ["http"]
 [dependencies]
 regex = "1.3.1"
 serde = "1.0.104"
-bytestring = "0.1.2"
+bytestring = ">=0.1.5, <2"
 log = "0.4.8"
 http = { version = "0.2.2", optional = true }
 
diff --git a/actix-server/src/builder.rs b/actix-server/src/builder.rs
index 51dd0eda..13c164f1 100644
--- a/actix-server/src/builder.rs
+++ b/actix-server/src/builder.rs
@@ -252,11 +252,6 @@ impl ServerBuilder {
         Ok(self)
     }
 
-    #[doc(hidden)]
-    pub fn start(self) -> Server {
-        self.run()
-    }
-
     /// Starts processing incoming connections and return server controller.
     pub fn run(mut self) -> Server {
         if self.sockets.is_empty() {
diff --git a/actix-server/src/test_server.rs b/actix-server/src/test_server.rs
index 627cc675..6f9c5f9a 100644
--- a/actix-server/src/test_server.rs
+++ b/actix-server/src/test_server.rs
@@ -49,10 +49,7 @@ impl TestServer {
         // run server in separate thread
         thread::spawn(move || {
             let sys = System::new("actix-test-server");
-            factory(Server::build())
-                .workers(1)
-                .disable_signals()
-                .start();
+            factory(Server::build()).workers(1).disable_signals().run();
 
             tx.send(System::current()).unwrap();
             sys.run()
@@ -83,7 +80,7 @@ impl TestServer {
                     .unwrap()
                     .workers(1)
                     .disable_signals()
-                    .start();
+                    .run();
                 tx.send((System::current(), local_addr)).unwrap();
             });
             sys.run()
diff --git a/actix-service/src/lib.rs b/actix-service/src/lib.rs
index 7bf979e5..960adda0 100644
--- a/actix-service/src/lib.rs
+++ b/actix-service/src/lib.rs
@@ -327,7 +327,9 @@ macro_rules! forward_ready {
             &mut self,
             cx: &mut ::core::task::Context<'_>,
         ) -> ::core::task::Poll<Result<(), Self::Error>> {
-            self.$field.poll_ready(cx)
+            self.$field
+                .poll_ready(cx)
+                .map_err(::core::convert::Into::into)
         }
     };
 }