diff --git a/matrix_sdk/src/client.rs b/matrix_sdk/src/client.rs
index 3fa19297..2b69f64b 100644
--- a/matrix_sdk/src/client.rs
+++ b/matrix_sdk/src/client.rs
@@ -1514,7 +1514,6 @@ mod test {
         set_read_marker, Invite3pid, MessageEventContent,
     };
     use super::{Client, ClientConfig, Session, SyncSettings, Url};
-    use crate::events::room::member::MembershipState;
     use crate::events::room::message::TextMessageEventContent;
 
     use crate::identifiers::{EventId, RoomId, RoomIdOrAliasId, UserId};
diff --git a/matrix_sdk_base/src/client.rs b/matrix_sdk_base/src/client.rs
index a4fa529a..a4dae71e 100644
--- a/matrix_sdk_base/src/client.rs
+++ b/matrix_sdk_base/src/client.rs
@@ -1845,9 +1845,9 @@ impl BaseClient {
 #[cfg(test)]
 mod test {
     use crate::identifiers::{RoomId, UserId};
-    use crate::{events::AnyRoomEventStub, BaseClient, Session};
+    use crate::{BaseClient, Session};
     use matrix_sdk_common_macros::async_trait;
-    use matrix_sdk_test::{async_test, test_json, EventBuilder, EventsFile};
+    use matrix_sdk_test::{async_test, test_json, EventBuilder, EventsJson};
     use serde_json::json;
     use std::convert::TryFrom;
 
diff --git a/matrix_sdk_base/src/event_emitter/mod.rs b/matrix_sdk_base/src/event_emitter/mod.rs
index 17e8f8a8..e0722eb1 100644
--- a/matrix_sdk_base/src/event_emitter/mod.rs
+++ b/matrix_sdk_base/src/event_emitter/mod.rs
@@ -461,8 +461,7 @@ mod test {
         async fn on_presence_event(&self, _: SyncRoom, _: &PresenceEvent) {
             self.0.lock().await.push("presence event".to_string())
         }
-        async fn on_unrecognized_event(&self, _: SyncRoom, event: &CustomOrRawEvent<'_>) {
-            println!("{:#?}", event);
+        async fn on_unrecognized_event(&self, _: SyncRoom, _: &CustomOrRawEvent<'_>) {
             self.0.lock().await.push("unrecognized event".to_string())
         }
     }
diff --git a/matrix_sdk_base/src/models/room.rs b/matrix_sdk_base/src/models/room.rs
index 52a37fd6..b4b85272 100644
--- a/matrix_sdk_base/src/models/room.rs
+++ b/matrix_sdk_base/src/models/room.rs
@@ -369,7 +369,17 @@ impl Room {
             return false;
         }
 
-        let member = RoomMember::new(event, room_id);
+        match event.membership_change() {
+            MembershipChange::Joined => self
+                .joined_members
+                .insert(new_member.user_id.clone(), new_member.clone()),
+            MembershipChange::Invited => self
+                .invited_members
+                .insert(new_member.user_id.clone(), new_member.clone()),
+            _ => {
+                panic!("Room::add_member called on an event that is neither a join nor an invite.")
+            }
+        };
 
         // Perform display name disambiguations, if necessary.
         let disambiguations = self.disambiguation_updates(&new_member, MemberDirection::Entering);
diff --git a/matrix_sdk_common/Cargo.toml b/matrix_sdk_common/Cargo.toml
index 354fef0d..26a89a13 100644
--- a/matrix_sdk_common/Cargo.toml
+++ b/matrix_sdk_common/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-authors = ["Damir Jelić <poljar@termina.org.uk"]
+authors = ["Damir Jelić <poljar@termina.org.uk>"]
 description = "Collection of common types used in the matrix-sdk"
 edition = "2018"
 homepage = "https://github.com/matrix-org/matrix-rust-sdk"
diff --git a/matrix_sdk_test/Cargo.toml b/matrix_sdk_test/Cargo.toml
index 694a69ac..07a0c8a6 100644
--- a/matrix_sdk_test/Cargo.toml
+++ b/matrix_sdk_test/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-authors = ["Damir Jelić <poljar@termina.org.uk"]
+authors = ["Damir Jelić <poljar@termina.org.uk>"]
 description = "Helpers to write tests for the Matrix SDK"
 edition = "2018"
 homepage = "https://github.com/matrix-org/matrix-rust-sdk"