diff --git a/gui/canvaspainter/v7/src/TCanvasPainter.cxx b/gui/canvaspainter/v7/src/TCanvasPainter.cxx
index dff8fd8a9760209c77a53512ca3c452e492fc852..11b318ad663a80a55a5290188de4be16ae30ec6f 100644
--- a/gui/canvaspainter/v7/src/TCanvasPainter.cxx
+++ b/gui/canvaspainter/v7/src/TCanvasPainter.cxx
@@ -440,7 +440,7 @@ void ROOT::Experimental::TCanvasPainter::ProcessData(unsigned connid, const std:
       return arg.compare(0, header.length(), header) == 0;
    };
 
-   WebConn *conn(nullptr);
+   WebConn *conn{nullptr};
    auto iter = fWebConn.begin();
    while (iter != fWebConn.end()) {
       if (iter->fConnId == connid) {
diff --git a/gui/webdisplay/inc/ROOT/TWebWindow.hxx b/gui/webdisplay/inc/ROOT/TWebWindow.hxx
index 252259ca92a2c9179f52ad481664fd6380ad3cd4..978c6e4e5625a9a5c9c193bb2283d7c5a6e5aa79 100644
--- a/gui/webdisplay/inc/ROOT/TWebWindow.hxx
+++ b/gui/webdisplay/inc/ROOT/TWebWindow.hxx
@@ -157,7 +157,7 @@ private:
 
    unsigned AddProcId(bool batch_mode, const std::string &key, const std::string &procid);
 
-   bool ProcessBatchHolder(std::shared_ptr<THttpCallArg> arg);
+   bool ProcessBatchHolder(std::shared_ptr<THttpCallArg> &arg);
 
 public:
    TWebWindow();
diff --git a/gui/webdisplay/inc/ROOT/TWebWindowsManager.hxx b/gui/webdisplay/inc/ROOT/TWebWindowsManager.hxx
index 0d3bfb448654d20d8fb9b9a4950bf080e337d914..f989818e39b8de5b3491f4407cf19381c38784c6 100644
--- a/gui/webdisplay/inc/ROOT/TWebWindowsManager.hxx
+++ b/gui/webdisplay/inc/ROOT/TWebWindowsManager.hxx
@@ -56,7 +56,7 @@ private:
    /// Returns timeout for launching new browser process
    float GetLaunchTmout() const { return fLaunchTmout; }
 
-   bool CreateHttpServer(bool with_http = false);
+   bool CreateServer(bool with_http = false);
 
    void Unregister(TWebWindow &win);
 
diff --git a/gui/webdisplay/src/TWebWindow.cxx b/gui/webdisplay/src/TWebWindow.cxx
index 43ba6b196eb597638ed30f3e6143f74c391e1df3..b730af668f3eca0daf7018af776b3e54861948c5 100644
--- a/gui/webdisplay/src/TWebWindow.cxx
+++ b/gui/webdisplay/src/TWebWindow.cxx
@@ -285,7 +285,7 @@ std::shared_ptr<ROOT::Experimental::TWebWindow::WebConn> ROOT::Experimental::TWe
 /// Such requests should not be replied for the long time
 /// Be aware that function called directly from THttpServer thread, which is not same thread as window
 
-bool ROOT::Experimental::TWebWindow::ProcessBatchHolder(std::shared_ptr<THttpCallArg> arg)
+bool ROOT::Experimental::TWebWindow::ProcessBatchHolder(std::shared_ptr<THttpCallArg> &arg)
 {
    std::string query = arg->GetQuery();
 
diff --git a/gui/webdisplay/src/TWebWindowWSHandler.hxx b/gui/webdisplay/src/TWebWindowWSHandler.hxx
index 3631b4df8c7d0a1416e95a033796b2d317fb1d1d..a9cb183505ab060de108184a1a3cd78d8b748173 100644
--- a/gui/webdisplay/src/TWebWindowWSHandler.hxx
+++ b/gui/webdisplay/src/TWebWindowWSHandler.hxx
@@ -28,7 +28,7 @@ namespace Experimental {
 class TWebWindowWSHandler : public THttpWSHandler {
 
 protected:
-   Bool_t ProcessBatchHolder(std::shared_ptr<THttpCallArg> arg) override
+   Bool_t ProcessBatchHolder(std::shared_ptr<THttpCallArg> &arg) override
    {
       return IsDisabled() ? kFALSE : fWindow.ProcessBatchHolder(arg);
    }
diff --git a/gui/webdisplay/src/TWebWindowsManager.cxx b/gui/webdisplay/src/TWebWindowsManager.cxx
index e1d5002731497ffdca9a4482572a40c5c55d7603..c3b0055f797167ca62e8e2ae4a98db7e83a23429 100644
--- a/gui/webdisplay/src/TWebWindowsManager.cxx
+++ b/gui/webdisplay/src/TWebWindowsManager.cxx
@@ -139,7 +139,7 @@ ROOT::Experimental::TWebWindowsManager::~TWebWindowsManager()
 ///
 ///      WebGui.HttpWSTmout: 10000
 
-bool ROOT::Experimental::TWebWindowsManager::CreateHttpServer(bool with_http)
+bool ROOT::Experimental::TWebWindowsManager::CreateServer(bool with_http)
 {
    // explicitly protect server creation
    // TWebWindowManagerGuard grd(*this);
@@ -249,8 +249,8 @@ std::shared_ptr<ROOT::Experimental::TWebWindow> ROOT::Experimental::TWebWindowsM
    // TWebWindowManagerGuard grd(*this);
    std::lock_guard<std::recursive_mutex> grd(fMutex);
 
-   if (!CreateHttpServer()) {
-      R__ERROR_HERE("WebDisplay") << "Cannot create http server when creating window";
+   if (!CreateServer()) {
+      R__ERROR_HERE("WebDisplay") << "Cannot create server when creating window";
       return nullptr;
    }
 
@@ -304,7 +304,7 @@ std::string ROOT::Experimental::TWebWindowsManager::GetUrl(const ROOT::Experimen
       addr.append("/");
 
    if (remote) {
-      if (!CreateHttpServer(true)) {
+      if (!CreateServer(true)) {
          R__ERROR_HERE("WebDisplay") << "Fail to start real HTTP server when requesting URL";
          return "";
       }
@@ -636,7 +636,7 @@ unsigned ROOT::Experimental::TWebWindowsManager::Show(ROOT::Experimental::TWebWi
       }
    }
 
-   if (!CreateHttpServer(true)) {
+   if (!CreateServer(true)) {
       R__ERROR_HERE("WebDisplay") << "Fail to start real HTTP server";
       return 0;
    }