diff --git a/Socket/INetAddressing.cc b/Socket/INetAddressing.cc
index b2e8edf85157721e432a6ff243653f40da5a8164..013704d73bc2dc2e53dd71ab981eea2ad20b774f 100644
--- a/Socket/INetAddressing.cc
+++ b/Socket/INetAddressing.cc
@@ -26,7 +26,7 @@
 //#include "INetAddressing.ih"
 
 // Custom includes
-#include <strstream>
+#include <sstream>
 #include <string.h>
 #include <sys/socket.h>
 #include <boost/lexical_cast.hpp>
diff --git a/Socket/SocketPolicy.ct b/Socket/SocketPolicy.ct
index b2b29448fad78559ee148c8ffd5063fdb20b89eb..277dc81ebac2259e469f5ee1347b135c1cebf145 100644
--- a/Socket/SocketPolicy.ct
+++ b/Socket/SocketPolicy.ct
@@ -36,7 +36,7 @@ template < BOOST_PP_SEQ_FOR_EACH_I( SP_TemplateArgs, , SATLIB_SOCKET_POLICIES )
 prefix_ void satcom::lib::SocketPolicy< BOOST_PP_SEQ_FOR_EACH_I( SP_TemplateParams, , SATLIB_SOCKET_POLICIES ) >::
 checkBaseOf(SocketPolicyBase const & other)
 {
-#   define SP_CheckPolicy(x1,x2,SomePolicy) dynamic_cast<SomePolicy const &>(other.BOOST_PP_CAT(the,SomePolicy)());
+#   define SP_CheckPolicy(x1,x2,SomePolicy) (void) dynamic_cast<SomePolicy const &>(other.BOOST_PP_CAT(the,SomePolicy)());
     BOOST_PP_SEQ_FOR_EACH( SP_CheckPolicy, , SATLIB_SOCKET_POLICIES )
 #   undef SP_CheckPolicy
 }