diff --git a/example/hello_world_over_tls.cpp b/example/hello_world_over_tls.cpp
index 5bc4cac..35f6a65 100644
--- a/example/hello_world_over_tls.cpp
+++ b/example/hello_world_over_tls.cpp
@@ -79,15 +79,15 @@ int main(int argc, char** argv) {
 
     // If you want to use the Client without logging, initialise it with the following line instead.
     //boost::mqtt5::mqtt_client<
-    //	boost::asio::ssl::stream<boost::asio::ip::tcp::socket>,
-    //	boost::asio::ssl::context
+    //    boost::asio::ssl::stream<boost::asio::ip::tcp::socket>,
+    //    boost::asio::ssl::context
     //> client(ioc, std::move(context));
 
     client.brokers(cfg.brokers, cfg.port) // Broker that we want to connect to.
         .credentials(cfg.client_id) // Set the Client Identifier. (optional)
         .async_run(boost::asio::detached); // Start the Client.
 
-    client.async_publish<boost/mqtt5::qos_e::at_most_once>(
+    client.async_publish<boost::mqtt5::qos_e::at_most_once>(
         "async-mqtt5/test", "Hello world!",
         boost::mqtt5::retain_e::no, boost::mqtt5::publish_props{},
         [&client](boost::mqtt5::error_code ec) {
diff --git a/example/hello_world_over_websocket_tls.cpp b/example/hello_world_over_websocket_tls.cpp
index 7086ac6..a6d89df 100644
--- a/example/hello_world_over_websocket_tls.cpp
+++ b/example/hello_world_over_websocket_tls.cpp
@@ -80,8 +80,8 @@ int main(int argc, char** argv) {
 
     // If you want to use the Client without logging, initialise it with the following line instead.
     //boost::mqtt5::mqtt_client<
-    //	boost::beast::websocket::stream<boost::asio::ssl::stream<boost::asio::ip::tcp::socket>>,
-    //	boost::asio::ssl::context
+    //    boost::beast::websocket::stream<boost::asio::ssl::stream<boost::asio::ip::tcp::socket>>,
+    //    boost::asio::ssl::context
     //> client(ioc, std::move(context));
 
     client.brokers(cfg.brokers, cfg.port) // Broker that we want to connect to.
diff --git a/example/publisher.cpp b/example/publisher.cpp
index a3e34c3..7d4e148 100644
--- a/example/publisher.cpp
+++ b/example/publisher.cpp
@@ -67,7 +67,7 @@ boost::asio::awaitable<void> publish_sensor_readings(
         auto&& [ec, rc, props] = co_await client.async_publish<boost::mqtt5::qos_e::at_least_once>(
             "async-mqtt5/test" /* topic */, reading /* payload */,
             boost::mqtt5::retain_e::no, boost::mqtt5::publish_props {}, use_nothrow_awaitable
-        );		
+        );
         // An error can occur as a result of:
         //  a) wrong publish parameters
         //  b) mqtt_client::cancel is called while the Client is publishing the message
diff --git a/include/boost/mqtt5/impl/autoconnect_stream.hpp b/include/boost/mqtt5/impl/autoconnect_stream.hpp
index 88860f4..20af127 100644
--- a/include/boost/mqtt5/impl/autoconnect_stream.hpp
+++ b/include/boost/mqtt5/impl/autoconnect_stream.hpp
@@ -25,7 +25,7 @@
 #include <cstdint>
 #include <memory>
 #include <string>
-#include <utility>
+#include <variant> // std::monostate
 
 namespace boost::mqtt5::detail {
 
diff --git a/include/boost/mqtt5/impl/client_service.hpp b/include/boost/mqtt5/impl/client_service.hpp
index 1be451f..38302b7 100644
--- a/include/boost/mqtt5/impl/client_service.hpp
+++ b/include/boost/mqtt5/impl/client_service.hpp
@@ -26,7 +26,7 @@
 #include <memory>
 #include <string>
 #include <type_traits>
-#include <utility>
+#include <variant> // std::monostate
 
 namespace boost::mqtt5::detail {
 
diff --git a/include/boost/mqtt5/types.hpp b/include/boost/mqtt5/types.hpp
index 91f56f6..924459e 100644
--- a/include/boost/mqtt5/types.hpp
+++ b/include/boost/mqtt5/types.hpp
@@ -142,7 +142,7 @@ enum class retain_handling_e : std::uint8_t {
  * \brief Represents the \__SUBSCRIBE_OPTIONS\__ associated with each Subscription.
  */
 struct subscribe_options {
-    /** \brief Maximum \__QOS\__ level at which the Server can send Application Messages to the Client.
+    /** \brief Maximum \__QOS\__ level at which the Server can send Application Messages to the Client. */
     qos_e max_qos = qos_e::exactly_once;
 
     /** \brief Option determining if Application Messages will be
diff --git a/test/unit/default_completion_tokens.cpp b/test/unit/default_completion_tokens.cpp
index 8465d7b..7fe382a 100644
--- a/test/unit/default_completion_tokens.cpp
+++ b/test/unit/default_completion_tokens.cpp
@@ -47,19 +47,19 @@ namespace test {
 // the following code needs to compile
 
 template <
-	typename StreamType,
-	typename TlsContextType = std::monostate,
-	typename Logger = noop_logger
+    typename StreamType,
+    typename TlsContextType = std::monostate,
+    typename Logger = noop_logger
 >
 asio::awaitable<void> test_default_completion_tokens_impl(
-	TlsContextType tls_context = {}, Logger logger = {}
+    TlsContextType tls_context = {}, Logger logger = {}
 ) {
     asio::io_context ioc;
 
-	using client_type = asio::use_awaitable_t<>::as_default_on_t<
-		mqtt_client<StreamType, TlsContextType, Logger>
-	>;
-	client_type c(ioc, std::move(tls_context), std::move(logger));
+    using client_type = asio::use_awaitable_t<>::as_default_on_t<
+        mqtt_client<StreamType, TlsContextType, Logger>
+    >;
+    client_type c(ioc, std::move(tls_context), std::move(logger));
 
     co_await c.async_run();
     
@@ -98,14 +98,14 @@ asio::awaitable<void> test_default_completion_tokens() {
         boost::beast::websocket::stream<asio::ip::tcp::socket>
     >();
 
-	co_await test_default_completion_tokens_impl<
-		boost::beast::websocket::stream<asio::ssl::stream<asio::ip::tcp::socket>>,
-		asio::ssl::context,
-		logger
-	>(
-		asio::ssl::context(asio::ssl::context::tls_client),
-		logger(log_level::debug)
-	);
+    co_await test_default_completion_tokens_impl<
+        boost::beast::websocket::stream<asio::ssl::stream<asio::ip::tcp::socket>>,
+        asio::ssl::context,
+        logger
+    >(
+        asio::ssl::context(asio::ssl::context::tls_client),
+        logger(log_level::debug)
+    );
 }
 
 } // end namespace test