diff --git a/Cargo.lock b/Cargo.lock
index 3c5d836..0e5da6f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -144,9 +144,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
@@ -247,9 +247,9 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
 
 [[package]]
 name = "cc"
-version = "1.0.58"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
+checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381"
 
 [[package]]
 name = "cfg-if"
@@ -960,9 +960,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.74"
+version = "0.2.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"
+checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3"
 
 [[package]]
 name = "lock_api"
@@ -1358,9 +1358,9 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
+checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20"
 
 [[package]]
 name = "proc-macro-crate"
@@ -2088,7 +2088,7 @@ checksum = "7345c971d1ef21ffdbd103a75990a15eb03604fc8b8852ca8cb418ee1a099028"
 [[package]]
 name = "state-res"
 version = "0.1.0"
-source = "git+https://github.com/ruma/state-res#4e9b428c0db50ac3a3421ced12a6fd202a1c36a3"
+source = "git+https://github.com/ruma/state-res#d93a965ad17781fa9554bb3cea71673c054b9f3f"
 dependencies = [
  "itertools",
  "js_int",
@@ -2179,9 +2179,9 @@ checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1"
 
 [[package]]
 name = "syn"
-version = "1.0.38"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4"
+checksum = "891d8d6567fe7c7f8835a3a98af4208f3846fba258c1bc3c31d6e506239f11f9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/src/client_server/config.rs b/src/client_server/config.rs
index 8cb6a0d..45aec33 100644
--- a/src/client_server/config.rs
+++ b/src/client_server/config.rs
@@ -56,11 +56,7 @@ pub fn get_global_account_data_route(
 
     let data = db
         .account_data
-        .get::<Raw<ruma::events::AnyBasicEvent>>(
-            None,
-            sender_id,
-            EventType::try_from(&body.event_type).expect("EventType::try_from can never fail"),
-        )?
+        .get::<Raw<ruma::events::AnyBasicEvent>>(None, sender_id, body.event_type.clone().into())?
         .ok_or(Error::BadRequest(ErrorKind::NotFound, "Data not found."))?;
 
     Ok(get_global_account_data::Response { account_data: data }.into())
diff --git a/src/client_server/room.rs b/src/client_server/room.rs
index 3ee21b6..c0603d3 100644
--- a/src/client_server/room.rs
+++ b/src/client_server/room.rs
@@ -195,6 +195,7 @@ pub fn create_room_route(
             content: match preset {
                 create_room::RoomPreset::PublicChat => {
                     serde_json::to_value(guest_access::GuestAccessEventContent::new(
+                        // In a public room a joining is the only way to access
                         guest_access::GuestAccess::Forbidden,
                     ))
                     .expect("event is valid, we just created it")
diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index c8ff198..0129742 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -722,7 +722,7 @@ impl Rooms {
                 }
                 EventType::RoomMember => event_auth::is_membership_change_allowed(
                     // TODO this is a bit of a hack but not sure how to have a type
-                    // declared in `state_res` crate be
+                    // declared in `state_res` crate easily convert to/from conduit::PduEvent
                     Requester {
                         prev_event_ids: prev_events.to_owned(),
                         room_id: &room_id,