diff --git a/src/GUI.cpp b/src/GUI.cpp
index 5786d011b..b81a759c1 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -231,6 +231,8 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   QMainWindow::statusBar()->addPermanentWidget(upSpeedLbl);
   QMainWindow::statusBar()->addPermanentWidget(statusSep4);
   QMainWindow::statusBar()->addPermanentWidget(ratioLbl);
+  // Force list update before showing
+  updateLists(true);
   if(!settings.value(QString::fromUtf8("Preferences/General/StartMinimized"), false).toBool()) {
     show();
   }
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index c94c9d81d..3aeca45ca 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -87,15 +87,6 @@ bittorrent::~bittorrent() {
   /*saveDHTEntry();
   saveSessionState();
   saveFastResumeData();*/
-  // Set Session settings
-  session_settings ss;
-  ss.tracker_receive_timeout = 1;
-  ss.stop_tracker_timeout = 1;
-  ss.tracker_completion_timeout = 1;
-  ss.piece_timeout = 1;
-  ss.peer_timeout = 1;
-  ss.urlseed_timeout = 1;
-  s->set_settings(ss);
   // Disable directory scanning
   disableDirectoryScanning();
   // Delete our objects
diff --git a/src/src.pro b/src/src.pro
index 980e406ec..a8b862644 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -93,7 +93,7 @@ DEFINES += NDEBUG
         icon192
 }
 QMAKE_CXXFLAGS_RELEASE += -fwrapv
-QMAKE_CXXFLAGS_DEBUG += -fwrapv
+QMAKE_CXXFLAGS_DEBUG += -fwrapv -O0
 CONFIG += link_pkgconfig
 PKGCONFIG += "libtorrent-rasterbar libcurl"