diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
index cad6d3ae7..8383a8eda 100644
--- a/libretroshare/src/rsserver/rsinit.cc
+++ b/libretroshare/src/rsserver/rsinit.cc
@@ -36,8 +36,6 @@
 #	include <QString> // for QString::fromStdString(...)
 #endif
 
-#include <QCoreApplication>
-
 #include "util/argstream.h"
 #include "util/rsdebug.h"
 #include "util/rsdir.h"
@@ -1975,8 +1973,7 @@ bool RsInit::startAutoTor()
             return false;
         }
         // process Qt event loop to deal with messages of online/offline info
-
-        QCoreApplication::processEvents();
+        // QCoreApplication::processEvents();
     }
     return true;
 }
diff --git a/libretroshare/src/tor/GetConfCommand.cpp b/libretroshare/src/tor/GetConfCommand.cpp
index f85f640c1..02e1df1ce 100644
--- a/libretroshare/src/tor/GetConfCommand.cpp
+++ b/libretroshare/src/tor/GetConfCommand.cpp
@@ -32,7 +32,6 @@
 
 #include "GetConfCommand.h"
 #include "StrUtil.h"
-#include <QDebug>
 
 using namespace Tor;
 
@@ -54,11 +53,11 @@ ByteArray GetConfCommand::build(const std::list<std::string> &keys)
     } else if (type == GetInfo) {
         out = "GETINFO";
     } else {
-        Q_ASSERT(false);
+        assert(false);
         return out;
     }
 
-    foreach (const ByteArray &key, keys) {
+    for(const ByteArray &key: keys) {
         out.append(' ');
         out.append(key);
     }
@@ -86,7 +85,7 @@ void GetConfCommand::onReply(int statusCode, const ByteArray &data)
 void GetConfCommand::onDataLine(const ByteArray &data)
 {
     if (m_lastKey.empty()) {
-        qWarning() << "torctrl: Unexpected data line in GetConf command";
+        RsWarn() << "torctrl: Unexpected data line in GetConf command";
         return;
     }
     m_results[m_lastKey].push_back(data.toString());