diff --git a/include/nbd_proxy.hpp b/include/nbd_proxy.hpp
index 462e4a7..ee0d9cd 100644
--- a/include/nbd_proxy.hpp
+++ b/include/nbd_proxy.hpp
@@ -89,7 +89,7 @@
 
         auto mountHandler = [this, self(shared_from_this())](
                                 const boost::system::error_code ec,
-                                const bool status) {
+                                const bool) {
             if (ec)
             {
                 BMCWEB_LOG_ERROR << "DBus error: cannot call mount method = "
@@ -433,7 +433,7 @@
                 session->second->close();
             })
         .onmessage([](crow::websocket::Connection& conn,
-                      const std::string& data, bool isBinary) {
+                      const std::string& data, bool) {
             BMCWEB_LOG_DEBUG << "nbd-proxy.onmessage(len = " << data.length()
                              << ")";
             // Acquire proxy from sessions
diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp
index dbe29b1..f6a56f6 100644
--- a/redfish-core/lib/virtual_media.hpp
+++ b/redfish-core/lib/virtual_media.hpp
@@ -795,8 +795,7 @@
 
             // Pass secret over pipe
             secretPipe->async_write(
-                [asyncResp](const boost::system::error_code& ec,
-                            std::size_t size) {
+                [asyncResp](const boost::system::error_code& ec, std::size_t) {
                     if (ec)
                     {
                         BMCWEB_LOG_ERROR << "Failed to pass secret: " << ec;
@@ -1012,7 +1011,7 @@
     /**
      * Functions triggers appropriate requests on DBus
      */
-    void doGet(crow::Response& res, const crow::Request& req,
+    void doGet(crow::Response& res, const crow::Request&,
                const std::vector<std::string>& params) override
     {
         auto asyncResp = std::make_shared<AsyncResp>(res);
@@ -1087,7 +1086,7 @@
     /**
      * Functions triggers appropriate requests on DBus
      */
-    void doGet(crow::Response& res, const crow::Request& req,
+    void doGet(crow::Response& res, const crow::Request&,
                const std::vector<std::string>& params) override
     {
         // Check if there is required param, truly entering this shall be
