diff --git a/src/internal/sio_client_impl.cpp b/src/internal/sio_client_impl.cpp
index c3b3a23d..028fcad1 100644
--- a/src/internal/sio_client_impl.cpp
+++ b/src/internal/sio_client_impl.cpp
@@ -321,7 +321,7 @@ namespace sio
     unsigned client_impl::next_delay() const
     {
         //no jitter, fixed power root.
-        return (unsigned)min(m_reconn_delay * pow(1.5,m_reconn_made),m_reconn_delay_max);
+        return min<unsigned>(m_reconn_delay * pow(1.5,m_reconn_made),m_reconn_delay_max);
     }
     
     void client_impl::send(packet& p)
diff --git a/src/internal/sio_client_impl.h b/src/internal/sio_client_impl.h
index c777d4ae..035322bf 100644
--- a/src/internal/sio_client_impl.h
+++ b/src/internal/sio_client_impl.h
@@ -89,7 +89,7 @@ void set_##__FIELD__(__TYPE__ const& l) \
         // Client Functions - such as send, etc.
         void connect(const std::string& uri);
         
-        socket::ptr const& socket(const std::string& nsp);
+        ::sio::socket::ptr const& socket(const std::string& nsp);
         
         // Closes the connection
         void close();
diff --git a/src/sio_client.h b/src/sio_client.h
index 960a533b..8febe847 100755
--- a/src/sio_client.h
+++ b/src/sio_client.h
@@ -62,7 +62,7 @@ namespace sio
 
         void set_reconnect_delay_max(unsigned millis);
         
-        socket::ptr const& socket(const std::string& nsp = "");
+        ::sio::socket::ptr const& socket(const std::string& nsp = "");
         
         // Closes the connection
         void close();