diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp
index e3eee892..5feffe0a 100644
--- a/servatrice/src/main.cpp
+++ b/servatrice/src/main.cpp
@@ -76,7 +76,6 @@ void myMessageOutput(QtMsgType /*type*/, const char *msg)
 void sigSegvHandler(int sig)
 {
 	logger->logMessage("SIGSEGV");
-	usleep(1000);
 	delete loggerThread;
 	raise(sig);
 }
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index 62992bf6..94ab833a 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -30,7 +30,6 @@
 void Servatrice_TcpServer::incomingConnection(int socketDescriptor)
 {
 	ServerSocketThread *sst = new ServerSocketThread(socketDescriptor, server, this);
-	connect(sst, SIGNAL(clientAdded(ServerSocketInterface *)), this, SIGNAL(clientAdded(ServerSocketInterface *)));
 	sst->start();
 }
 
@@ -57,7 +56,6 @@ Servatrice::Servatrice(QSettings *_settings, QObject *parent)
 	}
 	
 	tcpServer = new Servatrice_TcpServer(this);
-	connect(tcpServer, SIGNAL(clientAdded(ServerSocketInterface *)), this, SLOT(newConnection(ServerSocketInterface *)));
 	int port = settings->value("server/port", 4747).toInt();
 	qDebug() << "Starting server on port" << port;
 	tcpServer->listen(QHostAddress::Any, port);
@@ -154,11 +152,6 @@ bool Servatrice::execSqlQuery(QSqlQuery &query)
 	return false;
 }
 
-void Servatrice::newConnection(ServerSocketInterface *client)
-{
-	addClient(client);
-}
-
 AuthenticationResult Servatrice::checkUserPassword(const QString &user, const QString &password)
 {
 	QMutexLocker locker(&dbMutex);
diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h
index c4be3ec7..0296a903 100644
--- a/servatrice/src/servatrice.h
+++ b/servatrice/src/servatrice.h
@@ -41,15 +41,12 @@ public:
 		: QTcpServer(parent), server(_server) { }
 protected:
 	void incomingConnection(int socketDescriptor);
-signals:
-	void clientAdded(ServerSocketInterface *client);
 };
 
 class Servatrice : public Server
 {
 	Q_OBJECT
 private slots:
-	void newConnection(ServerSocketInterface *client);
 	void statusUpdate();
 	void updateBanTimer();
 public:
diff --git a/servatrice/src/server_logger.cpp b/servatrice/src/server_logger.cpp
index 07ba4278..0b59c46a 100644
--- a/servatrice/src/server_logger.cpp
+++ b/servatrice/src/server_logger.cpp
@@ -25,6 +25,7 @@ ServerLogger::ServerLogger(const QString &logFileName, QObject *parent)
 
 ServerLogger::~ServerLogger()
 {
+	flushBuffer();
 }
 
 void ServerLogger::logMessage(QString message)
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index d0036265..5aedb7db 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -54,6 +54,8 @@ ServerSocketInterface::ServerSocketInterface(Servatrice *_server, QTcpSocket *_s
 		deleteLater();
 	} else
 		sendProtocolItem(new Event_ServerMessage(Servatrice::versionString));
+	
+	server->addClient(this);
 }
 
 ServerSocketInterface::~ServerSocketInterface()
diff --git a/servatrice/src/serversocketthread.cpp b/servatrice/src/serversocketthread.cpp
index 4bb7129a..9c08ce1b 100644
--- a/servatrice/src/serversocketthread.cpp
+++ b/servatrice/src/serversocketthread.cpp
@@ -23,7 +23,5 @@ void ServerSocketThread::run()
 	ssi = new ServerSocketInterface(server, socket);
 	connect(ssi, SIGNAL(destroyed()), this, SLOT(deleteLater()));
 	
-	emit clientAdded(ssi);
-	
 	exec();
 }
diff --git a/servatrice/src/serversocketthread.h b/servatrice/src/serversocketthread.h
index 867756b5..2aa6dc8b 100644
--- a/servatrice/src/serversocketthread.h
+++ b/servatrice/src/serversocketthread.h
@@ -17,8 +17,6 @@ public:
 	~ServerSocketThread();
 protected:
 	void run();
-signals:
-	void clientAdded(ServerSocketInterface *client);
 };
 
 #endif