diff --git a/include/Swiften/Network/DummyNetworkFactories.h b/include/Swiften/Network/DummyNetworkFactories.h
index 50b9f338e2ddbafbf81b746350ab841161030fba..7671b23b69799675534584f9da3760a0bc29c0ba 100644
--- a/include/Swiften/Network/DummyNetworkFactories.h
+++ b/include/Swiften/Network/DummyNetworkFactories.h
@@ -32,6 +32,10 @@ namespace Swift {
 				return connectionServerFactory;
 			}
 
+			virtual Swift::NATTraverser* getNATTraverser() const {
+				return 0;
+			}
+
 		private:
 			TimerFactory* timerFactory;
 			ConnectionFactory* connectionFactory;
diff --git a/spectrum_manager/src/CMakeLists.txt b/spectrum_manager/src/CMakeLists.txt
index 73de569db1c8f0600aabd8fac6f84cc57db3fbae..5654350129b2e36fff9fc04e5c25e8466cca0281 100644
--- a/spectrum_manager/src/CMakeLists.txt
+++ b/spectrum_manager/src/CMakeLists.txt
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp)
 
-ADD_EXECUTABLE(spectrum_manager ${SRC})
+ADD_EXECUTABLE(spectrum2_manager ${SRC})
 
-target_link_libraries(spectrum_manager transport)
+target_link_libraries(spectrum2_manager transport)
 
-INSTALL(TARGETS spectrum_manager RUNTIME DESTINATION bin)
+INSTALL(TARGETS spectrum2_manager RUNTIME DESTINATION bin)
 
 INSTALL(FILES
 	spectrum_manager.cfg
diff --git a/src/conversation.cpp b/src/conversation.cpp
index c4cc2e21146c35abc9aaf341244e7c797e86f957..238fe4c8423e566cefac6a475b1ea886ee5c8fd3 100644
--- a/src/conversation.cpp
+++ b/src/conversation.cpp
@@ -106,10 +106,14 @@ void Conversation::handleParticipantChanged(const std::string &nick, int flag, i
 	}
 
 	
-	Swift::MUCUserPayload::Item item(Swift::MUCOccupant::Member, Swift::MUCOccupant::Participant);
+	Swift::MUCItem item;
+	
+	item.affiliation = Swift::MUCOccupant::Member;
+	item.role = Swift::MUCOccupant::Participant;
 
 	if (flag & Moderator) {
-		item = Swift::MUCUserPayload::Item(Swift::MUCOccupant::Admin, Swift::MUCOccupant::Moderator);
+		item.affiliation = Swift::MUCOccupant::Admin;
+		item.role = Swift::MUCOccupant::Moderator;
 	}
 
 	if (!newname.empty()) {