diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index 38f27252a..e89208748 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -4,6 +4,7 @@
 ### Added
 * Re-export `http` crate's `Error` type as `error::HttpError`. [#2171]
 * Re-export `StatusCode`, `Method`, `Version` and `Uri` at the crate root. [#2171]
+* Re-export `ContentEncoding` and `ConnectionType` at the crate root. [#2171]
 
 ### Changed
 * `header` mod is now public. [#2171]
diff --git a/actix-http/src/lib.rs b/actix-http/src/lib.rs
index 5c6b0f3f6..82d0415c2 100644
--- a/actix-http/src/lib.rs
+++ b/actix-http/src/lib.rs
@@ -56,21 +56,20 @@ pub use self::builder::HttpServiceBuilder;
 pub use self::config::{KeepAlive, ServiceConfig};
 pub use self::error::{Error, ResponseError, Result};
 pub use self::extensions::Extensions;
+pub use self::header::ContentEncoding;
 pub use self::http_message::HttpMessage;
+pub use self::message::ConnectionType;
 pub use self::message::{Message, RequestHead, RequestHeadType, ResponseHead};
 pub use self::payload::{Payload, PayloadStream};
 pub use self::request::Request;
 pub use self::response::Response;
 pub use self::response_builder::ResponseBuilder;
 pub use self::service::HttpService;
-pub use self::header::ContentEncoding;
-pub use self::message::ConnectionType;
 
-pub use ::http::{StatusCode, Version, Method};
 pub use ::http::{uri, uri::Uri};
+pub use ::http::{Method, StatusCode, Version};
 
-// deprecate this mish-mash of random items
-#[deprecated = "Everything in this module is available elsewhere."]
+// TODO: deprecate this mish-mash of random items
 pub mod http {
     //! Various HTTP related types.
 
diff --git a/actix-http/src/response_builder.rs b/actix-http/src/response_builder.rs
index f4516b1db..0105f70cf 100644
--- a/actix-http/src/response_builder.rs
+++ b/actix-http/src/response_builder.rs
@@ -289,7 +289,7 @@ impl ResponseBuilder {
             return None;
         }
 
-        self.head.as_mut().map(|r| &mut **r)
+        self.head.as_deref_mut()
     }
 }
 
diff --git a/awc/tests/test_ssl_client.rs b/awc/tests/test_ssl_client.rs
index 57305e49a..811efd4bc 100644
--- a/awc/tests/test_ssl_client.rs
+++ b/awc/tests/test_ssl_client.rs
@@ -7,7 +7,7 @@ use std::sync::Arc;
 
 use actix_http::HttpService;
 use actix_http_test::test_server;
-use actix_service::{map_config, fn_service, ServiceFactoryExt};
+use actix_service::{fn_service, map_config, ServiceFactoryExt};
 use actix_utils::future::ok;
 use actix_web::http::Version;
 use actix_web::{dev::AppConfig, web, App, HttpResponse};