diff --git a/TODO b/TODO
index c82c00096..73e9b7de9 100644
--- a/TODO
+++ b/TODO
@@ -8,11 +8,9 @@
 - Skins support? (contact Mateusz)
 
 // Harder
-- Display a progress bar that really represents the pieces we have (like in eMule)
 - Torrent scheduler ala µtorrent/Bitcomet
 
 // Waiting for libtorrent
-- File selection in a torrent in compact mode
 - Allow to prioritize torrents (may code this in qBittorrent?)
 
 // Unsure
@@ -52,14 +50,19 @@
   -> in download list
   -> in seeding list
 
+// TODO v1.0.0
+- Fix libcommoncpp proxy support
+- Fix layout in preferences/Proxy
+
 rc8->rc9 changelog:
 - FEATURE: Better media file preview (player detected automatically)
 - BUGFIX: Remember properties window size and position
 - BUGFIX: Added proxy support in search engine, RSS, downloads from urls
 - BUGFIX: Do no pause torrents before saving fastresume data anymore (no longer needed)
-- BUGFIX: Save fast resume data regularly (every 10 seconds) to avoid downloading from scratch if qBittorrent crashes
+- BUGFIX: Save fast resume data regularly (every 60 seconds) to avoid downloading from scratch if qBittorrent crashes
 - BUGFIX: Do not save fastresume data for checking torrents anymore
 - BUGFIX: Saving trackers file only when necessary
 - BUGFIX: Fixed possible segfault when unfiltering files in torrent addition dialog
 - BUGFIX: Fixed possible overflow in ETA calculation
 - BUGFIX: title bar is now reset when "Display speed in title" is disabled
+- BUGFIX: Fixed HTTP_PW and SOCKS5_PW in proxy combobox
diff --git a/src/downloadThread.cpp b/src/downloadThread.cpp
index 5ca3dd752..34c7697b2 100644
--- a/src/downloadThread.cpp
+++ b/src/downloadThread.cpp
@@ -55,7 +55,7 @@ subDownloadThread::subDownloadThread(QObject *parent, QString url) : QThread(par
   url_stream = new ost::URLStream();
   // Proxy support
   QSettings settings("qBittorrent", "qBittorrent");
-  int intValue = settings.value(QString::fromUtf8("[Preferences/Connection/ProxyType"), 0).toInt();
+  int intValue = settings.value(QString::fromUtf8("Preferences/Connection/ProxyType"), 0).toInt();
   if(intValue > 0) {
     // Proxy enabled
     url_stream->setProxy(settings.value(QString::fromUtf8("Preferences/Connection/Proxy/IP"), "0.0.0.0").toString().toUtf8().data(), settings.value(QString::fromUtf8("Preferences/Connection/Proxy/Port"), 8080).toInt());
diff --git a/src/options_imp.cpp b/src/options_imp.cpp
index 3e4504f47..b26eb0acc 100644
--- a/src/options_imp.cpp
+++ b/src/options_imp.cpp
@@ -460,7 +460,15 @@ void options_imp::loadOptions(){
     spinUploadLimit->setEnabled(false);
   }
   intValue = settings.value(QString::fromUtf8("ProxyType"), 0).toInt();
-  if(intValue < 0) intValue = 0;
+  if(intValue <= 0) {
+    intValue = 0;
+  } else {
+    if(intValue%2 == 0) {
+      intValue = 2;
+    }else {
+      intValue = 1;
+    }
+  }
   comboProxyType->setCurrentIndex(intValue);
   enableProxy(intValue);
   if(isProxyEnabled()) {