diff --git a/TODO b/TODO
index 3958df1e5..33780fc84 100644
--- a/TODO
+++ b/TODO
@@ -47,8 +47,6 @@
   - .ico support?
   - display debug when fastresume data is rejected
   - Download/Finished lists cleanup
-  - Use valgrind to detect memory leaks
-  - optimize includes for compilation speed
   - Move transfer lists refreshers to threads
   - Wait for some bug fixes in libtorrent :
     - upload/download limit per torrent
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 5b4812867..d5091eebc 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -890,6 +890,9 @@ void bittorrent::readAlerts(){
     else if (peer_blocked_alert* p = dynamic_cast<peer_blocked_alert*>(a.get())){
       emit peerBlocked(QString(p->ip.to_string().c_str()));
     }
+    else if (fastresume_rejected_alert* p = dynamic_cast<fastresume_rejected_alert*>(a.get())){
+      emit fastResumeDataRejected(QString(p->handle.name().c_str()));
+    }
     a = s->pop_alert();
   }
 }
diff --git a/src/bittorrent.h b/src/bittorrent.h
index 79f3b1e85..70b87b679 100644
--- a/src/bittorrent.h
+++ b/src/bittorrent.h
@@ -146,6 +146,7 @@ class bittorrent : public QObject{
     void allTorrentsFinishedChecking();
     void peerBlocked(QString);
     void downloadFromUrlFailure(QString url, QString reason);
+    void fastResumeDataRejected(QString name);
 
 };
 
diff --git a/src/properties_imp.cpp b/src/properties_imp.cpp
index a10bf5199..ee14a0284 100644
--- a/src/properties_imp.cpp
+++ b/src/properties_imp.cpp
@@ -287,7 +287,7 @@ void properties::deleteSelectedTrackers(){
 }
 
 void properties::riseSelectedTracker(){
-  unsigned int i;
+  unsigned int i = 0;
   std::vector<announce_entry> trackers = h.trackers();
   QList<QListWidgetItem *> selectedItems;
   selectedItems = trackersURLS->selectedItems();
@@ -318,7 +318,7 @@ void properties::riseSelectedTracker(){
 }
 
 void properties::lowerSelectedTracker(){
-  unsigned int i;
+  unsigned int i = 0;
   std::vector<announce_entry> trackers = h.trackers();
   QList<QListWidgetItem *> selectedItems;
   selectedItems = trackersURLS->selectedItems();