diff --git a/client/Makefile b/client/Makefile
index c0bcb63d..b548df13 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -2,11 +2,8 @@ VERSION = 0.3.90
 TARGET  = snapclient
 SHELL = /bin/bash
 
-#CXX     = /home/johannes/Develop/android-ndk-r10e-arm-21/bin/arm-linux-androideabi-g++
-#CFLAGS  = -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I.. -I../externals/asio/asio/include -I../externals/tclap/include -I../externals/ezOptionParser -I/home/johannes/Develop/build/arm/include -L/home/johannes/Develop/build/arm/lib
-
 CXX     = /usr/bin/g++
-CFLAGS  = -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I.. -I../externals/asio/asio/include -I../externals/tclap/include -I../externals/ezOptionParser
+CFLAGS  = -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I.. -I../externals/asio/asio/include
 LDFLAGS = -lrt -lasound -logg -lvorbis -lvorbisenc -lFLAC -lavahi-client -lavahi-common
 
 OBJ = snapClient.o stream.o clientConnection.o timeProvider.o player/player.o player/alsaPlayer.o decoder/oggDecoder.o decoder/pcmDecoder.o decoder/flacDecoder.o controller.o browseAvahi.o ../message/pcmChunk.o ../common/log.o ../message/sampleFormat.o
diff --git a/client/clientConnection.cpp b/client/clientConnection.cpp
index aff2f22d..9b5b9cbb 100644
--- a/client/clientConnection.cpp
+++ b/client/clientConnection.cpp
@@ -92,9 +92,9 @@ void ClientConnection::stop()
 		if (socket_)
 		{
 			socket_->shutdown(asio::ip::tcp::socket::shutdown_both, ec);
-			if (ec) logE << "Error in socket shutdown: " << ec << endl;
+			if (ec) logE << "Error in socket shutdown: " << ec.message() << endl;
 			socket_->close(ec);
-			if (ec) logE << "Error in socket close: " << ec << endl;
+			if (ec) logE << "Error in socket close: " << ec.message() << endl;
 		}
 		if (readerThread_)
 		{
diff --git a/server/controlSession.cpp b/server/controlSession.cpp
index 1b9a7047..f472d062 100644
--- a/server/controlSession.cpp
+++ b/server/controlSession.cpp
@@ -56,9 +56,9 @@ void ControlSession::stop()
 		if (socket_)
 		{
 			socket_->shutdown(asio::ip::tcp::socket::shutdown_both, ec);
-			if (ec) logE << "Error in socket shutdown: " << ec << "\n";
+			if (ec) logE << "Error in socket shutdown: " << ec.message() << "\n";
 			socket_->close(ec);
-			if (ec) logE << "Error in socket close: " << ec << "\n";
+			if (ec) logE << "Error in socket close: " << ec.message() << "\n";
 		}
 		if (readerThread_)
 		{
diff --git a/server/streamSession.cpp b/server/streamSession.cpp
index 8838c503..00c3e422 100644
--- a/server/streamSession.cpp
+++ b/server/streamSession.cpp
@@ -58,9 +58,9 @@ void StreamSession::stop()
 		if (socket_)
 		{
 			socket_->shutdown(asio::ip::tcp::socket::shutdown_both, ec);
-			if (ec) logE << "Error in socket shutdown: " << ec << "\n";
+			if (ec) logE << "Error in socket shutdown: " << ec.message() << "\n";
 			socket_->close(ec);
-			if (ec) logE << "Error in socket close: " << ec << "\n";
+			if (ec) logE << "Error in socket close: " << ec.message() << "\n";
 		}
 		if (readerThread_)
 		{