diff --git a/src/torrent.cpp b/src/torrent.cpp
index 83f338473..56109e1af 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -12224,7 +12224,7 @@ namespace libtorrent
 			st->pieces.resize(num_pieces, false);
 		}
 		st->num_pieces = num_have();
-		st->num_seeds = num_seeds();
+		st->num_seeds = num_seeds() - int(m_num_connecting_seeds);
 		if ((flags & torrent_handle::query_distributed_copies) && m_picker.get())
 		{
 			boost::tie(st->distributed_full_copies, st->distributed_fraction) =
diff --git a/src/torrent_info.cpp b/src/torrent_info.cpp
index 8dc50188b..482bd96b3 100644
--- a/src/torrent_info.cpp
+++ b/src/torrent_info.cpp
@@ -149,7 +149,7 @@ namespace libtorrent
 			res = ConvertUTF32toUTF8(const_cast<const UTF32**>(&cp), cp + 1, &start, start + 5, lenientConversion);
 			TORRENT_ASSERT(res == conversionOK);
 
-			for (int i = 0; i < start - sequence; ++i)
+			for (int i = 0; i < std::min(5, int(start - sequence)); ++i)
 				tmp_path += char(sequence[i]);
 		}