diff --git a/.waf-tools/websocket.py b/.waf-tools/websocket.py
index c5b3384..f8d2e33 100644
--- a/.waf-tools/websocket.py
+++ b/.waf-tools/websocket.py
@@ -59,10 +59,10 @@
 
         self.end_msg('.'.join(self.env['WEBSOCKET_VERSION']))
 
-
         self.env['INCLUDES_WEBSOCKET'] = websocketDir.parent.abspath()
         self.env['HAVE_WEBSOCKET'] = True
         self.define('HAVE_WEBSOCKET', 1)
+        self.define('_WEBSOCKETPP_CPP11_STL_', 1)
 
     except Errors.WafError as error:
         if isMandatory:
diff --git a/daemon/face/websocket-channel.hpp b/daemon/face/websocket-channel.hpp
index bd5604b..f7c6ae2 100644
--- a/daemon/face/websocket-channel.hpp
+++ b/daemon/face/websocket-channel.hpp
@@ -128,7 +128,8 @@
    */
   FaceCreatedCallback m_onFaceCreatedCallback;
 
-  typedef std::map< websocketpp::connection_hdl, shared_ptr<WebSocketFace> > ChannelFaceMap;
+  typedef std::map< websocketpp::connection_hdl, shared_ptr<WebSocketFace>,
+                    std::owner_less<websocketpp::connection_hdl> > ChannelFaceMap;
   ChannelFaceMap m_channelFaces;
 
   /**