diff --git a/src/GUI.cpp b/src/GUI.cpp
index fc78d413b..8a9141d95 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -352,12 +352,13 @@ void GUI::balloonClicked() {
 }
 
 void GUI::acceptConnection() {
-  clientConnection = localServer->nextPendingConnection();
+  QLocalSocket *clientConnection = localServer->nextPendingConnection();
   connect(clientConnection, SIGNAL(disconnected()), this, SLOT(readParamsOnSocket()));
   qDebug("accepted connection from another instance");
 }
 
 void GUI::readParamsOnSocket() {
+  QLocalSocket *clientConnection = static_cast<QLocalSocket*>(sender());
   if(clientConnection) {
     QByteArray params = clientConnection->readAll();
     if(!params.isEmpty()) {
diff --git a/src/GUI.h b/src/GUI.h
index 35e0ccdb1..155189435 100644
--- a/src/GUI.h
+++ b/src/GUI.h
@@ -43,7 +43,6 @@ class QTimer;
 class downloadFromURL;
 class SearchEngine;
 class QLocalServer;
-class QLocalSocket;
 class QCloseEvent;
 class RSSImp;
 class QShortcut;
@@ -78,25 +77,24 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     TransferListWidget *transferList;
     TransferListFiltersWidget *transferListFilters;
     PropertiesWidget *properties;
-    QSplitter *hSplitter;
-    QSplitter *vSplitter;
     bool displaySpeedInTitle;
     bool force_exit;
-    //unsigned int refreshInterval;
     // Keyboard shortcuts
     QShortcut *switchSearchShortcut;
     QShortcut *switchSearchShortcut2;
     QShortcut *switchTransferShortcut;
     QShortcut *switchRSSShortcut;
+    // Widgets
     QAction *prioSeparator;
     QAction *prioSeparator2;
+    QSplitter *hSplitter;
+    QSplitter *vSplitter;
     // Search
     SearchEngine *searchEngine;
     // RSS
     QPointer<RSSImp> rssWidget;
     // Misc
     QLocalServer *localServer;
-    QLocalSocket *clientConnection;
 
   protected slots:
     // GUI related slots