diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp
index 6a38bf124..fc544593c 100644
--- a/include/libtorrent/config.hpp
+++ b/include/libtorrent/config.hpp
@@ -67,6 +67,10 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 #endif
 
+#ifndef INT64_MAX
+#define INT64_MAX 0x7fffffffffffffffLL
+#endif
+
 // backwards compatibility with older versions of boost
 #if !defined BOOST_SYMBOL_EXPORT && !defined BOOST_SYMBOL_IMPORT
 # if defined _MSC_VER || defined __MINGW32__
diff --git a/include/libtorrent/upnp.hpp b/include/libtorrent/upnp.hpp
index 7b6e2df55..37406231a 100644
--- a/include/libtorrent/upnp.hpp
+++ b/include/libtorrent/upnp.hpp
@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/deadline_timer.hpp"
 
 #include <boost/function/function1.hpp>
-#include <boost/function/function3.hpp>
+#include <boost/function/function4.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 #include <set>
diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index d7801fddd..3617742d5 100644
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -918,17 +918,10 @@ namespace aux {
 #endif
 
 		PRINT_SIZEOF(udp_socket)
-		PRINT_OFFSETOF(udp_socket, m_callback)
-		PRINT_OFFSETOF(udp_socket, m_callback2)
 		PRINT_OFFSETOF(udp_socket, m_ipv4_sock)
-		PRINT_OFFSETOF(udp_socket, m_v4_ep)
-		PRINT_OFFSETOF(udp_socket, m_v4_buf)
-		PRINT_OFFSETOF(udp_socket, m_reallocate_buffer4)
+		PRINT_OFFSETOF(udp_socket, m_buf)
 #if TORRENT_USE_IPV6
 		PRINT_OFFSETOF(udp_socket, m_ipv6_sock)
-		PRINT_OFFSETOF(udp_socket, m_v6_ep)
-		PRINT_OFFSETOF(udp_socket, m_v6_buf)
-		PRINT_OFFSETOF(udp_socket, m_reallocate_buffer6)
 #endif
 		PRINT_OFFSETOF(udp_socket, m_bind_port)
 		PRINT_OFFSETOF(udp_socket, m_v4_outstanding)
@@ -2462,6 +2455,7 @@ namespace aux {
 				&& m_alerts.should_post<udp_error_alert>())
 				m_alerts.post_alert(udp_error_alert(ep, ec));
 		}
+		return false;
 	}
 
 	void session_impl::async_accept(boost::shared_ptr<socket_acceptor> const& listener, bool ssl)