diff --git a/backends/twitter/libtwitcurl/oauthlib.h b/backends/twitter/libtwitcurl/oauthlib.h
index 5f702e01..306ffc6b 100644
--- a/backends/twitter/libtwitcurl/oauthlib.h
+++ b/backends/twitter/libtwitcurl/oauthlib.h
@@ -41,9 +41,9 @@ namespace oAuthLibDefaults
 namespace oAuthTwitterApiUrls
 {
     /* Twitter OAuth API URLs */
-    const std::string OAUTHLIB_TWITTER_REQUEST_TOKEN_URL = "twitter.com/oauth/request_token";
-    const std::string OAUTHLIB_TWITTER_AUTHORIZE_URL = "twitter.com/oauth/authorize?oauth_token=";
-    const std::string OAUTHLIB_TWITTER_ACCESS_TOKEN_URL = "twitter.com/oauth/access_token";
+    const std::string OAUTHLIB_TWITTER_REQUEST_TOKEN_URL = "api.twitter.com/oauth/request_token";
+    const std::string OAUTHLIB_TWITTER_AUTHORIZE_URL = "api.twitter.com/oauth/authorize?oauth_token=";
+    const std::string OAUTHLIB_TWITTER_ACCESS_TOKEN_URL = "api.twitter.com/oauth/access_token";
 };
 
 typedef enum _eOAuthHttpRequestType
diff --git a/include/Swiften/Network/DummyNetworkFactories.cpp b/include/Swiften/Network/DummyNetworkFactories.cpp
index 567d467a..9da055e3 100644
--- a/include/Swiften/Network/DummyNetworkFactories.cpp
+++ b/include/Swiften/Network/DummyNetworkFactories.cpp
@@ -15,7 +15,8 @@ namespace Swift {
 DummyNetworkFactories::DummyNetworkFactories(EventLoop* eventLoop) {
 	timerFactory = new DummyTimerFactory();
 	connectionFactory = new DummyConnectionFactory(eventLoop);
-	domainNameResolver = new PlatformDomainNameResolver(eventLoop);
+	idnConverter = boost::shared_ptr<IDNConverter>(PlatformIDNConverter::create());
+	domainNameResolver = new PlatformDomainNameResolver(idnConverter.get(), eventLoop);
 	connectionServerFactory = new DummyConnectionServerFactory(eventLoop);
 	m_platformXMLParserFactory =  new PlatformXMLParserFactory();
 	this->eventLoop = eventLoop;
diff --git a/include/Swiften/Network/DummyNetworkFactories.h b/include/Swiften/Network/DummyNetworkFactories.h
index 546cb0cc..64694e8a 100644
--- a/include/Swiften/Network/DummyNetworkFactories.h
+++ b/include/Swiften/Network/DummyNetworkFactories.h
@@ -8,6 +8,8 @@
 
 #include <Swiften/Network/NetworkFactories.h>
 #include <Swiften/Parser/PlatformXMLParserFactory.h>
+#include <Swiften/IDN/IDNConverter.h>
+#include <Swiften/IDN/PlatformIDNConverter.h>
 
 namespace Swift {
 	class EventLoop;
@@ -25,6 +27,10 @@ namespace Swift {
 				return connectionFactory;
 			}
 
+			IDNConverter* getIDNConverter() const {
+				return idnConverter.get();
+			}
+
 			DomainNameResolver* getDomainNameResolver() const {
 				return domainNameResolver;
 			}
@@ -57,6 +63,7 @@ namespace Swift {
 			PlatformXMLParserFactory *m_platformXMLParserFactory;
 			TimerFactory* timerFactory;
 			ConnectionFactory* connectionFactory;
+			boost::shared_ptr<IDNConverter> idnConverter;
 			DomainNameResolver* domainNameResolver;
 			ConnectionServerFactory* connectionServerFactory;
 			EventLoop *eventLoop;