diff --git a/docs/manual.html b/docs/manual.html
index fe43227d5..59fcad740 100755
--- a/docs/manual.html
+++ b/docs/manual.html
@@ -837,7 +837,7 @@ struct torrent_handle
 <p>The default constructor will initialize the handle to an invalid state. Which means you cannot
 perform any operation on it, unless you first assign it a valid handle. If you try to perform
 any operation on an uninitialized handle, it will throw <tt class="literal"><span class="pre">invalid_handle</span></tt>.</p>
-<p><em>TODO: document ``trackers()`` and ``replace_trackers()``</em></p>
+<p><strong>TODO: document trackers() and replace_trackers()</strong></p>
 <div class="section" id="save-path">
 <h2><a name="save-path">save_path()</a></h2>
 <blockquote>
diff --git a/docs/manual.rst b/docs/manual.rst
index 0dc4af2b2..090d9775c 100755
--- a/docs/manual.rst
+++ b/docs/manual.rst
@@ -778,7 +778,7 @@ The default constructor will initialize the handle to an invalid state. Which me
 perform any operation on it, unless you first assign it a valid handle. If you try to perform
 any operation on an uninitialized handle, it will throw ``invalid_handle``.
 
-*TODO: document ``trackers()`` and ``replace_trackers()``*
+**TODO: document trackers() and replace_trackers()**
 
 save_path()
 -----------
diff --git a/src/storage.cpp b/src/storage.cpp
index 0fd26dfc5..e2596b374 100755
--- a/src/storage.cpp
+++ b/src/storage.cpp
@@ -350,9 +350,6 @@ namespace libtorrent
 			if (file_offset + read_bytes > file_iter->size)
 				read_bytes = static_cast<int>(file_iter->size - file_offset);
 
-			// TODO: this assert will be hit if a file has size 0
-			assert(read_bytes > 0);
-
 			size_type actual_read = in.read(buf + buf_pos, read_bytes);
 
 			if (read_bytes != actual_read)
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 79277ef25..9c3c176dd 100755
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -262,9 +262,9 @@ namespace libtorrent
 		, int interval)
 	{
 		m_failed_trackers = 0;
-		// less than 60 seconds announce intervals
+		// less than 5 minutes announce intervals
 		// are insane.
-		if (interval < 60) interval = 60;
+		if (interval < 60 * 5) interval = 60 * 5;
 
 		m_last_working_tracker
 			= prioritize_tracker(m_currently_trying_tracker);