diff --git a/src/core/manager.cc b/src/core/manager.cc
index c8d6ebd5..3b7ca688 100644
--- a/src/core/manager.cc
+++ b/src/core/manager.cc
@@ -186,16 +186,19 @@ Manager::create_final(std::istream* s) {
 }
 
 void
-Manager::receive_debug_tracker(torrent::Bencode& bencode) {
+Manager::receive_debug_tracker(std::istream* s) {
   std::stringstream filename;
   filename << "./tracker_dump." << m_debugTracker++;
 
   std::fstream out(filename.str().c_str(), std::ios::out | std::ios::trunc);
 
-  if (!out.good())
+  if (!out.is_open())
     return;
+  
+  s->seekg(0);
 
-  out << bencode;
+  std::copy(std::istream_iterator<char>(*s), std::istream_iterator<char>(),
+	    std::ostream_iterator<char>(out));
 }
 
 }
diff --git a/src/core/manager.h b/src/core/manager.h
index f2fff943..5f03723c 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -23,6 +23,8 @@
 #ifndef RTORRENT_CORE_MANAGER_H
 #define RTORRENT_CORE_MANAGER_H
 
+#include <iosfwd>
+
 #include "download_list.h"
 #include "download_store.h"
 #include "hash_queue.h"
@@ -81,7 +83,7 @@ private:
 
   iterator            create_final(std::istream* s);
 
-  void                receive_debug_tracker(torrent::Bencode& bencode);
+  void                receive_debug_tracker(std::istream* s);
 
   DownloadList        m_downloadList;
   DownloadStore       m_downloadStore;
diff --git a/src/core/poll.cc b/src/core/poll.cc
index faf8d2e5..f18074dc 100644
--- a/src/core/poll.cc
+++ b/src/core/poll.cc
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include <errno.h>
+#include <unistd.h>
 #include <stdexcept>
 #include <sstream>
 #include <ncurses.h>
diff --git a/src/display/utils.cc b/src/display/utils.cc
index c455ebd9..13ee9f51 100644
--- a/src/display/utils.cc
+++ b/src/display/utils.cc
@@ -54,7 +54,8 @@ print_download_status(core::Download* d) {
 
 std::string
 print_hhmmss(utils::Timer t) {
-  std::tm *u = std::localtime(&(time_t)t.tval().tv_sec);
+  time_t tv_sec = static_cast<time_t>(t.tval().tv_sec);
+  std::tm *u = std::localtime(&tv_sec);
   
   if (u == NULL)
     return "inv_time";