diff --git a/src/cpp/websocketpp/src/roles/server.hpp b/src/cpp/websocketpp/src/roles/server.hpp
index 969eb3109..7f1758f01 100644
--- a/src/cpp/websocketpp/src/roles/server.hpp
+++ b/src/cpp/websocketpp/src/roles/server.hpp
@@ -591,7 +591,7 @@ void server<endpoint>::connection<connection_type>::handle_read_request(
                 m_version = -1;
                 shared_const_buffer buffer(reply);
                 m_connection.get_socket().async_write(
-                    buffer,
+                    shared_const_buffer(reply),
                     boost::bind(
                         &type::handle_write_response,
                         m_connection.shared_from_this(),
diff --git a/src/cpp/websocketpp/src/sockets/autotls.hpp b/src/cpp/websocketpp/src/sockets/autotls.hpp
index cdbe0632b..8ab2bca94 100644
--- a/src/cpp/websocketpp/src/sockets/autotls.hpp
+++ b/src/cpp/websocketpp/src/sockets/autotls.hpp
@@ -73,7 +73,7 @@ public:
         }
     }
     
-    // TLS policy adds the on_autotls_init method to the handler to allow the user
+    // TLS policy adds the on_tls_init method to the handler to allow the user
     // to set up their asio TLS context.
     class handler_interface {
     public: