diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d8e0c79..64c1b6d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,7 +131,9 @@ else()
         -DMSGPACK_DISABLE_LEGACY_NIL \
         -DMSGPACK_DISABLE_LEGACY_CONVERT \
         -DUNICODE \
-        -D_UNICODE")
+        -D_UNICODE \
+        -DNOMINMAX \
+        ")
 endif()
 
 if (DNC_SYSTEMD AND BUILD_TOOLS AND NOT MSVC)
diff --git a/src/upnp/protocol/mapping.cpp b/src/upnp/protocol/mapping.cpp
index fa9b6c73..7e3c0366 100644
--- a/src/upnp/protocol/mapping.cpp
+++ b/src/upnp/protocol/mapping.cpp
@@ -14,8 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
+
 #include "upnp/mapping.h"
-// #include "logger.h"
 #include "igd.h"
 
 namespace dhtnet {
@@ -63,7 +63,6 @@ void
 Mapping::updateFrom(const Mapping& other)
 {
     if (type_ != other.type_) {
-        // JAMI_ERR("The source and destination types must match");
         return;
     }
 
@@ -77,11 +76,6 @@ Mapping::updateFrom(const Mapping& other)
 void
 Mapping::setAvailable(bool val)
 {
-    // JAMI_DBG("Changing mapping %s state from %s to %s",
-    //          toString().c_str(),
-    //          available_ ? "AVAILABLE" : "UNAVAILABLE",
-    //          val ? "AVAILABLE" : "UNAVAILABLE");
-
     std::lock_guard lock(mutex_);
     available_ = val;
 }