diff --git a/bindings/python/src/torrent_handle.cpp b/bindings/python/src/torrent_handle.cpp
index c398b47f9..a0c4ae107 100644
--- a/bindings/python/src/torrent_handle.cpp
+++ b/bindings/python/src/torrent_handle.cpp
@@ -265,8 +265,6 @@ list trackers(torrent_handle& h)
 
 list get_download_queue(torrent_handle& handle)
 {
-    using boost::python::make_tuple;
-
     list ret;
 
     std::vector<partial_piece_info> downloading;
@@ -291,7 +289,8 @@ list get_download_queue(torrent_handle& handle)
             block_info["bytes_progress"] = i->blocks[k].bytes_progress;
             block_info["block_size"] = i->blocks[k].block_size;
             block_info["peer"] = boost::python::make_tuple(
-                boost::lexical_cast<std::string>(i->blocks[k].peer().address()), i->blocks[k].peer().port());
+                i->blocks[k].peer().address().to_string()
+					 , i->blocks[k].peer().port());
             block_list.append(block_info);
         }
         partial_piece["blocks"] = block_list;
diff --git a/src/socket_type.cpp b/src/socket_type.cpp
index 0b9dc0371..cb9ae07bb 100644
--- a/src/socket_type.cpp
+++ b/src/socket_type.cpp
@@ -148,7 +148,7 @@ namespace libtorrent
 	s.get<ssl_stream<t> >()->async_shutdown(boost::bind(&on_close_socket, &s, holder)); \
 	break;
 
-		switch(s.type())
+		switch (s.type())
 		{
 			CASE(stream_socket)
 			CASE(socks5_stream)