diff --git a/src/bt_peer_connection.cpp b/src/bt_peer_connection.cpp
index d955f0961..9a24d94a0 100644
--- a/src/bt_peer_connection.cpp
+++ b/src/bt_peer_connection.cpp
@@ -843,7 +843,7 @@ namespace libtorrent
 				else bitmask += '0';
 			}
 		}
-		peer_log("<<< EXTENSION_BITS [ %s ]", bitmask.c_str());
+		peer_log(">>> EXTENSION_BITS [ %s ]", bitmask.c_str());
 #endif
 		i.begin += 8;
 
@@ -861,7 +861,7 @@ namespace libtorrent
 		TORRENT_ASSERT(i.begin == i.end);
 
 #ifdef TORRENT_VERBOSE_LOGGING
-		peer_log("==> HANDSHAKE");
+		peer_log("==> HANDSHAKE [ ih: %s ]", to_hex(ih.to_string()).c_str());
 #endif
 		setup_send();
 	}
diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index 1c6558628..19d2e28d2 100644
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -35,6 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
 #include <boost/limits.hpp>
 #include <boost/bind.hpp>
+#include <stdarg.h> // for va_start, va_end
 
 #include "libtorrent/peer_connection.hpp"
 #include "libtorrent/identify_client.hpp"
@@ -4646,7 +4647,7 @@ namespace libtorrent
 		{
 #ifdef TORRENT_VERBOSE_LOGGING
 			peer_log("<<< CANNOT READ [ quota: %d ignore: %s "
-				"can-write-to-disk: %d queue-limit: %d disconnecting: %s ]"
+				"can-write-to-disk: %s queue-limit: %d disconnecting: %s ]"
 				, m_quota[download_channel]
 				, (m_ignore_bandwidth_limits?"yes":"no")
 				, (m_ses.can_write_to_disk()?"yes":"no")