diff --git a/include/boost/beast/core/detail/stream_base.hpp b/include/boost/beast/core/detail/stream_base.hpp
index a65a8022..1a664160 100644
--- a/include/boost/beast/core/detail/stream_base.hpp
+++ b/include/boost/beast/core/detail/stream_base.hpp
@@ -91,7 +91,7 @@ struct stream_base
         }
     };
 
-    static constexpr time_point never()
+    static time_point never() noexcept
     {
         return (time_point::max)();
     }
diff --git a/include/boost/beast/websocket/stream.hpp b/include/boost/beast/websocket/stream.hpp
index 76b08d5e..bdcfc29f 100644
--- a/include/boost/beast/websocket/stream.hpp
+++ b/include/boost/beast/websocket/stream.hpp
@@ -152,7 +152,7 @@ class stream
     using time_point = typename
         std::chrono::steady_clock::time_point;
 
-    static constexpr time_point never()
+    static time_point never() noexcept
     {
         return (time_point::max)();
     }
diff --git a/include/boost/beast/websocket/stream_base.hpp b/include/boost/beast/websocket/stream_base.hpp
index 0a30f0dd..44860507 100644
--- a/include/boost/beast/websocket/stream_base.hpp
+++ b/include/boost/beast/websocket/stream_base.hpp
@@ -33,7 +33,6 @@ struct stream_base
 
     /// Returns the special time_point value meaning "never"
     static
-    constexpr
     time_point
     never() noexcept
     {
@@ -42,7 +41,6 @@ struct stream_base
 
     /// Returns the special duration value meaning "none"
     static
-    constexpr
     duration
     none() noexcept
     {
diff --git a/test/bench/wsload/wsload.cpp b/test/bench/wsload/wsload.cpp
index e15c1520..e8c1954a 100644
--- a/test/bench/wsload/wsload.cpp
+++ b/test/bench/wsload/wsload.cpp
@@ -155,7 +155,7 @@ public:
         ws_.next_layer().async_connect(ep_,
             alloc_.wrap(beast::bind_front_handler(
                 &connection::on_connect,
-                shared_from_this())));
+                this->shared_from_this())));
     }
 
 private:
@@ -170,7 +170,7 @@ private:
             "/",
             alloc_.wrap(beast::bind_front_handler(
                 &connection::on_handshake,
-                shared_from_this())));
+                this->shared_from_this())));
     }
 
     void
@@ -191,7 +191,7 @@ private:
             beast::buffers_prefix(dist(rng_), tb_),
             alloc_.wrap(beast::bind_front_handler(
                 &connection::on_write,
-                shared_from_this())));
+                this->shared_from_this())));
     }
 
     void
@@ -206,7 +206,7 @@ private:
         ws_.async_close({},
             alloc_.wrap(beast::bind_front_handler(
                 &connection::on_close,
-                shared_from_this())));
+                this->shared_from_this())));
     }
 
     void
@@ -215,7 +215,7 @@ private:
         ws_.async_read(buffer_,
             alloc_.wrap(beast::bind_front_handler(
                 &connection::on_read,
-                shared_from_this())));
+                this->shared_from_this())));
     }
 
     void