diff --git a/libtorrent/bindings/python/src/ip_filter.cpp b/libtorrent/bindings/python/src/ip_filter.cpp
index eed216141..7ce72cf50 100644
--- a/libtorrent/bindings/python/src/ip_filter.cpp
+++ b/libtorrent/bindings/python/src/ip_filter.cpp
@@ -13,16 +13,21 @@ namespace
 {
     void add_rule(ip_filter& filter, std::string start, std::string end, int flags)
     {
-        return filter.add_rule(address_v4::from_string(start), address_v4::from_string(end), flags);
+        return filter.add_rule(address::from_string(start), address::from_string(end), flags);
+    }
+    
+    int _access(ip_filter& filter, std::string addr)
+    {
+        return filter.access(address::from_string(addr));
     }
 }
 
 void bind_ip_filter()
 {
     class_<ip_filter>("ip_filter")
-        .def("add_rule", &add_rule)
-        .def("access", allow_threads(&ip_filter::access))
-        .def_readonly("export_filter", allow_threads(&ip_filter::export_filter))
+        .def("add_rule", add_rule)
+        .def("access", _access)
+        .def("export_filter", allow_threads(&ip_filter::export_filter))
     ;
 }
 
diff --git a/libtorrent/src/http_connection.cpp b/libtorrent/src/http_connection.cpp
index 5158796b6..73904dae6 100644
--- a/libtorrent/src/http_connection.cpp
+++ b/libtorrent/src/http_connection.cpp
@@ -336,7 +336,7 @@ void http_connection::callback(error_code const& e, char const* data, int size)
 	if (!m_bottled || !m_called)
 	{
 		std::vector<char> buf;
-		if (m_bottled && m_parser.finished())
+		if (m_bottled && m_parser.header_finished())
 		{
 			std::string const& encoding = m_parser.header("content-encoding");
 			if (encoding == "gzip" || encoding == "x-gzip")