diff --git a/src/ChatPage.cc b/src/ChatPage.cc
index 9a1a2652..a6a80e9d 100644
--- a/src/ChatPage.cc
+++ b/src/ChatPage.cc
@@ -193,10 +193,12 @@ ChatPage::ChatPage(QSharedPointer<MatrixClient> client, QWidget *parent)
                 SIGNAL(ownAvatarRetrieved(const QPixmap &)),
                 this,
                 SLOT(setOwnAvatar(const QPixmap &)));
-        connect(
-          client_.data(), SIGNAL(addRoom(const QString &)), this, SLOT(addRoom(const QString &)));
         connect(client_.data(),
-                SIGNAL(removeRoom(const QString &)),
+                SIGNAL(joinedRoom(const QString &)),
+                this,
+                SLOT(addRoom(const QString &)));
+        connect(client_.data(),
+                SIGNAL(leftRoom(const QString &)),
                 this,
                 SLOT(removeRoom(const QString &)));
 
diff --git a/src/Sync.cc b/src/Sync.cc
index 810e487d..90314352 100644
--- a/src/Sync.cc
+++ b/src/Sync.cc
@@ -96,7 +96,8 @@ Rooms::deserialize(const QJsonValue &data)
                         } catch (DeserializationException &e) {
                                 qWarning() << e.what();
                                 qWarning() << "Skipping malformed object for room" << it.key();
-                        }                }
+                        }
+                }
         }
 
         if (object.contains("invite")) {
@@ -124,7 +125,6 @@ Rooms::deserialize(const QJsonValue &data)
                         }
                 }
         }
-
 }
 
 void