diff --git a/include/libtorrent/web_connection_base.hpp b/include/libtorrent/web_connection_base.hpp
index 1f4a59d58..1299b1ebd 100644
--- a/include/libtorrent/web_connection_base.hpp
+++ b/include/libtorrent/web_connection_base.hpp
@@ -116,8 +116,7 @@ namespace libtorrent
 		void write_interested() {}
 		void write_not_interested() {}
 		virtual void write_request(peer_request const& r) = 0;
-		void write_cancel(peer_request const& r)
-		{ incoming_reject_request(r); }
+		void write_cancel(peer_request const& r) {}
 		void write_have(int index) {}
 		void write_piece(peer_request const& r, disk_buffer_holder& buffer) { TORRENT_ASSERT(false); }
 		void write_keepalive() {}
diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index 78235b896..5bbb8bd49 100644
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -2422,7 +2422,7 @@ namespace libtorrent
 			// blocks exceeds the size of the outstanding queue, assume that
 			// the other end dropped the request.
 			if (m_ses.m_settings.drop_skipped_requests
-				&& qe.skipped > m_desired_queue_size)
+				&& qe.skipped > m_desired_queue_size * 2)
 			{
 				if (m_ses.m_alerts.should_post<request_dropped_alert>())
 					m_ses.m_alerts.post_alert(request_dropped_alert(t->get_handle()
diff --git a/src/storage.cpp b/src/storage.cpp
index 2e69910f4..d67f2f678 100644
--- a/src/storage.cpp
+++ b/src/storage.cpp
@@ -1250,8 +1250,7 @@ ret:
 					m_file_created.set_bit(file_index);
 					if (ec)
 					{
-						set_error(combine_path(m_save_path
-							, files().file_path(file_index, m_save_path)), ec);
+						set_error(files().file_path(file_index, m_save_path), ec);
 						return -1;
 					}
 				}