diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26d38756..150a10df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -274,20 +274,19 @@ message("Version           : " ${SPECTRUM_VERSION})
 
 if (SQLITE3_FOUND)
 	ADD_DEFINITIONS(-DWITH_SQLITE)
+if (WIN32)
+	include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
+	message("SQLite3           : bundled")
+else (WIN32)
 	include_directories(${SQLITE3_INCLUDE_DIR})
 	message("SQLite3           : yes")
+endif (WIN32)
 else (SQLITE3_FOUND)
-	if (WIN32)
-		ADD_DEFINITIONS(-DWITH_SQLITE)
-		include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
-		message("SQLite3           : bundled")
-	else()
-		set(SQLITE3_LIBRARIES "")
-		if(ENABLE_SQLITE3)
-			message("SQLite3           : no (install sqlite3)")
-		else(ENABLE_SQLITE3)
-			message("SQLite3           : no (user disabled)")
-		endif()
+	set(SQLITE3_LIBRARIES "")
+	if(ENABLE_SQLITE3)
+		message("SQLite3           : no (install sqlite3)")
+	else(ENABLE_SQLITE3)
+		message("SQLite3           : no (user disabled)")
 	endif()
 endif (SQLITE3_FOUND)
 
diff --git a/backends/twitter/libtwitcurl/twitcurl.h b/backends/twitter/libtwitcurl/twitcurl.h
index 8d18f166..97ba99ad 100644
--- a/backends/twitter/libtwitcurl/twitcurl.h
+++ b/backends/twitter/libtwitcurl/twitcurl.h
@@ -5,6 +5,7 @@
 #include <sstream>
 #include <cstring>
 #include <vector>
+#include <algorithm>
 #include "oauthlib.h"
 #include "curl/curl.h"
 
diff --git a/cmake_modules/SwiftenConfig.cmake b/cmake_modules/SwiftenConfig.cmake
index 34217b3a..0d677fcd 100644
--- a/cmake_modules/SwiftenConfig.cmake
+++ b/cmake_modules/SwiftenConfig.cmake
@@ -5,6 +5,11 @@ if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
 	find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable" HINTS ../bin)
 	set( SWIFTEN_CFLAGS "" )
 	if (SWIFTEN_CONFIG_EXECUTABLE)
+		execute_process(
+			COMMAND ${SWIFTEN_CONFIG_EXECUTABLE} --version
+			OUTPUT_VARIABLE SWIFTEN_VERSION)
+		string(REGEX MATCH "([0-9])" SWIFTEN_VERSION "${SWIFTEN_VERSION}")
+		message(STATUS "Swiften version ${SWIFTEN_VERSION}")
 		execute_process(
 			COMMAND ${SWIFTEN_CONFIG_EXECUTABLE} --libs
 			OUTPUT_VARIABLE SWIFTEN_LIB)
diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt
index 726a57fb..0773f936 100644
--- a/libtransport/CMakeLists.txt
+++ b/libtransport/CMakeLists.txt
@@ -15,7 +15,12 @@ else()
 	string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") 
 	string(REGEX REPLACE "[^;]+;?/SecureTransport/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}")
 endif()
-
+if (SWIFTEN_VERSION GREATER 2)
+	list(REMOVE_ITEM SWIFTEN_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../include/Swiften/Network/DummyConnectionServer.h")
+	list(REMOVE_ITEM SWIFTEN_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../include/Swiften/Network/DummyConnectionServerFactory.h")
+	list(REMOVE_ITEM SWIFTEN_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../include/Swiften/Network/DummyConnectionServer.cpp")
+	list(REMOVE_ITEM SWIFTEN_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../include/Swiften/Network/DummyConnectionServerFactory.cpp")
+endif()
 FILE(GLOB HEADERS ../include/transport/*.h)
 include_directories(../spectrum/src/frontends/xmpp/)
 
@@ -48,7 +53,7 @@ find_package(CURL)
 
 if (WIN32)
 	include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3")
-	TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${CURL_LIBRARIES ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} psapi.lib)
+	TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} psapi.lib)
 else()
 	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY})
 endif()
diff --git a/libtransport/FileTransferManager.cpp b/libtransport/FileTransferManager.cpp
index c8c4e0b9..069ef21a 100644
--- a/libtransport/FileTransferManager.cpp
+++ b/libtransport/FileTransferManager.cpp
@@ -83,7 +83,7 @@ FileTransferManager::~FileTransferManager() {
 }
 
 FileTransferManager::Transfer FileTransferManager::sendFile(User *user, Buddy *buddy, boost::shared_ptr<Swift::ReadBytestream> byteStream, const Swift::StreamInitiationFileInfo &info) {
-// 	FileTransferManager::Transfer transfer;
+ 	FileTransferManager::Transfer transfer;
 // 	transfer.from = buddy->getJID();
 // 	transfer.to = user->getJID();
 // 	transfer.readByteStream = byteStream;
@@ -96,7 +96,7 @@ FileTransferManager::Transfer FileTransferManager::sendFile(User *user, Buddy *b
 // // 		ft->onStateChange.connect(boost::bind(&User::handleFTStateChanged, this, _1, Buddy::JIDToLegacyName(from), info.getName(), info.getSize(), id));
 // // 		transfer.ft->start();
 // // 	}
-// 	return transfer;
+ 	return transfer;
 }
 
 }
diff --git a/spectrum/src/frontends/xmpp/XMPPFrontend.cpp b/spectrum/src/frontends/xmpp/XMPPFrontend.cpp
index 2840fca6..0ee8faf7 100644
--- a/spectrum/src/frontends/xmpp/XMPPFrontend.cpp
+++ b/spectrum/src/frontends/xmpp/XMPPFrontend.cpp
@@ -347,7 +347,7 @@ void XMPPFrontend::handleConnected() {
 }
 
 void XMPPFrontend::handleServerStopped(boost::optional<Swift::BoostConnectionServer::Error> e) {
-	if(e != NULL ) {
+	if(e) {
 		if(*e == Swift::BoostConnectionServer::Conflict) {
 			LOG4CXX_INFO(logger, "Port "<< CONFIG_INT(m_config, "service.port") << " already in use! Stopping server..");
 			if (CONFIG_INT(m_config, "service.port") == 5347) {