diff --git a/chat/indico_chat/models/chatrooms.py b/chat/indico_chat/models/chatrooms.py
index 90b4149..b6413e6 100644
--- a/chat/indico_chat/models/chatrooms.py
+++ b/chat/indico_chat/models/chatrooms.py
@@ -19,7 +19,6 @@ from __future__ import unicode_literals
 from indico.core.db.sqlalchemy import db, UTCDateTime
 from indico.util.date_time import now_utc
 from indico.util.string import return_ascii
-from MaKaC.conference import ConferenceHolder
 
 from indico_chat.xmpp import delete_room
 
diff --git a/chat/indico_chat/plugin.py b/chat/indico_chat/plugin.py
index 885a13d..72814e5 100644
--- a/chat/indico_chat/plugin.py
+++ b/chat/indico_chat/plugin.py
@@ -150,7 +150,7 @@ class ChatPlugin(IndicoPlugin):
             return url_for_plugin('chat.manage_rooms', event)
 
     def event_deleted(self, event, **kwargs):
-        for event_chatroom in ChatroomEventAssociation.find_for_event(event.as_event, include_hidden=True):
+        for event_chatroom in ChatroomEventAssociation.find_for_event(event, include_hidden=True):
             chatroom_deleted = event_chatroom.delete()
             notify_deleted(event_chatroom.chatroom, event, None, chatroom_deleted)
 
diff --git a/livesync/tests/uploader_test.py b/livesync/tests/uploader_test.py
index 98a848a..9080609 100644
--- a/livesync/tests/uploader_test.py
+++ b/livesync/tests/uploader_test.py
@@ -16,11 +16,12 @@
 
 from mock import MagicMock, Mock
 
+from indico.modules.events.legacy import LegacyConference
+
 from indico_livesync import SimpleChange
 from indico_livesync.models.queue import LiveSyncQueueEntry, ChangeType, EntryType
 from indico_livesync.uploader import Uploader, MARCXMLUploader
 
-from MaKaC.conference import Conference
 
 
 class RecordingUploader(Uploader):
@@ -60,7 +61,7 @@ def test_run_initial(mocker):
     mocker.patch.object(Uploader, 'processed_records', autospec=True)
     uploader = RecordingUploader(MagicMock())
     uploader.INITIAL_BATCH_SIZE = 3
-    records = tuple(Mock(spec=Conference, id=evt_id) for evt_id in xrange(4))
+    records = tuple(Mock(spec=LegacyConference, id=evt_id) for evt_id in xrange(4))
     uploader.run_initial(records)
     # We expect two batches, with the second one being smaller (i.e. no None padding, just the events)
     batches = set(records[:3]), set(records[3:])