diff --git a/CMakeLists.txt b/CMakeLists.txt
index 817588ce9..76f9eea9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,12 +89,12 @@ ELSEIF (CMAKE_COMPILER_IS_GNUCXX)
             SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${FLAG}")
         ENDIF()
     ENDFOREACH()
-ELSEIF (CMAKE_COMPILER_IS_CLANGXX)
+ELSE()
     # osx/llvm, bsd/llvm
     # linux/gcc, bsd/gcc, windows/mingw
     include(CheckCXXCompilerFlag)
 
-    set(CMAKE_CXX_FLAGS_RELEASE "-s -std=c++11 -pedantic -O3")
+    set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -pedantic -O3")
     set(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -Wextra -std=c++11 -pedantic -Werror")
 
     set(ADDITIONAL_DEBUG_FLAGS -Wcast-align -Wmissing-declarations -Wno-long-long -Wno-error=extra -Wno-error=sign-compare -Wno-error=missing-declarations)
@@ -105,10 +105,6 @@ ELSEIF (CMAKE_COMPILER_IS_CLANGXX)
             SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${FLAG}")
         ENDIF()
     ENDFOREACH()
-ELSE()
-    # other:
-    set(CMAKE_CXX_FLAGS_RELEASE "-s -pedantic -std=c++98 -O3")
-    set(CMAKE_CXX_FLAGS_DEBUG "-g")
 ENDIF()
 
 # GNU systems need to define the Mersenne exponent for the RNG to compile w/o warning
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index dd5618465..4911a816d 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -108,7 +108,11 @@ void Servatrice_GameServer::incomingConnection(qintptr socketDescriptor)
     QMetaObject::invokeMethod(ssi, "initConnection", Qt::QueuedConnection, Q_ARG(int, socketDescriptor));
 }
 
+#if QT_VERSION < 0x050000
 void Servatrice_IslServer::incomingConnection(int socketDescriptor)
+#else
+void Servatrice_IslServer::incomingConnection(qintptr socketDescriptor)
+#endif
 {
     QThread *thread = new QThread;
     connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h
index 86da6dc58..baa2e6e89 100644
--- a/servatrice/src/servatrice.h
+++ b/servatrice/src/servatrice.h
@@ -68,7 +68,11 @@ public:
 	Servatrice_IslServer(Servatrice *_server, const QSslCertificate &_cert, const QSslKey &_privateKey, QObject *parent = 0)
 		: QTcpServer(parent), server(_server), cert(_cert), privateKey(_privateKey) { }
 protected:
+#if QT_VERSION < 0x050000
 	void incomingConnection(int socketDescriptor);
+#else
+	void incomingConnection(qintptr socketDescriptor);
+#endif
 };
 
 class ServerProperties {