diff --git a/backends/libyahoo2/main.cpp b/backends/libyahoo2/main.cpp
index df88ab8b..eb5fbe5b 100644
--- a/backends/libyahoo2/main.cpp
+++ b/backends/libyahoo2/main.cpp
@@ -107,7 +107,11 @@ class YahooPlugin : public NetworkPlugin {
 			this->config = config;
 			m_factories = new Swift::BoostNetworkFactories(loop);
 			m_sslFactory = new Swift::OpenSSLContextFactory();
+#if HAVE_SWIFTEN3
+			m_tlsFactory = new Swift::TLSConnectionFactory(m_sslFactory, m_factories->getConnectionFactory(), Swift::TLSOptions());
+#else
 			m_tlsFactory = new Swift::TLSConnectionFactory(m_sslFactory, m_factories->getConnectionFactory());
+#endif
 			m_conn = m_factories->getConnectionFactory()->createConnection();
 			m_conn->onDataRead.connect(boost::bind(&YahooPlugin::_handleDataRead, this, _1));
 			m_conn->connect(Swift::HostAddressPort(Swift::HostAddress(host), port));
diff --git a/backends/twitter/CMakeLists.txt b/backends/twitter/CMakeLists.txt
index 12ecb84a..68e4103f 100644
--- a/backends/twitter/CMakeLists.txt
+++ b/backends/twitter/CMakeLists.txt
@@ -2,7 +2,7 @@ include_directories (${libtransport_SOURCE_DIR}/backends/twitter/libtwitcurl)
 FILE(GLOB SRC *.cpp libtwitcurl/*.cpp Requests/*.cpp)
 add_executable(spectrum2_twitter_backend ${SRC})
 
-find_package(curl)
+find_package(CURL)
 
 if(CURL_FOUND)
 message(STATUS "Using curl ${CURL_VERSION_STRING}: ${CURL_INCLUDE_DIRS} ${CURL_LIBRARIES}")