diff --git a/crates/ruma-client-api/src/keys/claim_keys/v3.rs b/crates/ruma-client-api/src/keys/claim_keys/v3.rs
index 590f871d..ffdd835a 100644
--- a/crates/ruma-client-api/src/keys/claim_keys/v3.rs
+++ b/crates/ruma-client-api/src/keys/claim_keys/v3.rs
@@ -18,6 +18,7 @@ const METADATA: Metadata = metadata! {
     rate_limited: false,
     authentication: AccessToken,
     history: {
+        unstable => "/_matrix/client/unstable/keys/claim",
         1.0 => "/_matrix/client/r0/keys/claim",
         1.1 => "/_matrix/client/v3/keys/claim",
     }
diff --git a/crates/ruma-client-api/src/keys/get_key_changes.rs b/crates/ruma-client-api/src/keys/get_key_changes.rs
index 2564e6bf..cd11957d 100644
--- a/crates/ruma-client-api/src/keys/get_key_changes.rs
+++ b/crates/ruma-client-api/src/keys/get_key_changes.rs
@@ -17,6 +17,7 @@ pub mod v3 {
         rate_limited: false,
         authentication: AccessToken,
         history: {
+            unstable => "/_matrix/client/unstable/keys/changes",
             1.0 => "/_matrix/client/r0/keys/changes",
             1.1 => "/_matrix/client/v3/keys/changes",
         }
diff --git a/crates/ruma-client-api/src/keys/get_keys.rs b/crates/ruma-client-api/src/keys/get_keys.rs
index 3ddfd91e..7ff56390 100644
--- a/crates/ruma-client-api/src/keys/get_keys.rs
+++ b/crates/ruma-client-api/src/keys/get_keys.rs
@@ -23,6 +23,7 @@ pub mod v3 {
         rate_limited: false,
         authentication: AccessToken,
         history: {
+            unstable => "/_matrix/client/unstable/keys/query",
             1.0 => "/_matrix/client/r0/keys/query",
             1.1 => "/_matrix/client/v3/keys/query",
         }
diff --git a/crates/ruma-client-api/src/keys/upload_keys.rs b/crates/ruma-client-api/src/keys/upload_keys.rs
index ef509ed4..3b1c0aef 100644
--- a/crates/ruma-client-api/src/keys/upload_keys.rs
+++ b/crates/ruma-client-api/src/keys/upload_keys.rs
@@ -23,6 +23,7 @@ pub mod v3 {
         rate_limited: false,
         authentication: AccessToken,
         history: {
+            unstable => "/_matrix/client/unstable/keys/upload",
             1.0 => "/_matrix/client/r0/keys/upload",
             1.1 => "/_matrix/client/v3/keys/upload",
         }
diff --git a/crates/ruma-client-api/src/keys/upload_signatures.rs b/crates/ruma-client-api/src/keys/upload_signatures.rs
index 76510b94..c8a6ecfe 100644
--- a/crates/ruma-client-api/src/keys/upload_signatures.rs
+++ b/crates/ruma-client-api/src/keys/upload_signatures.rs
@@ -28,6 +28,7 @@ pub mod v3 {
         authentication: AccessToken,
         history: {
             unstable => "/_matrix/client/unstable/keys/signatures/upload",
+            1.0 => "/_matrix/client/r0/keys/signatures/upload",
             1.1 => "/_matrix/client/v3/keys/signatures/upload",
         }
     };
@@ -98,11 +99,11 @@ pub mod v3 {
     #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct Failure {
         /// Machine-readable error code.
-        errcode: FailureErrorCode,
+        pub errcode: FailureErrorCode,
 
         /// Human-readable error message.
         #[cfg_attr(feature = "compat-upload-signatures", serde(alias = "message"))]
-        error: String,
+        pub error: String,
     }
 
     /// Error code for signed key processing failures.
diff --git a/crates/ruma-client-api/src/keys/upload_signing_keys.rs b/crates/ruma-client-api/src/keys/upload_signing_keys.rs
index 1412150e..3bf82c05 100644
--- a/crates/ruma-client-api/src/keys/upload_signing_keys.rs
+++ b/crates/ruma-client-api/src/keys/upload_signing_keys.rs
@@ -22,6 +22,7 @@ pub mod v3 {
         authentication: AccessToken,
         history: {
             unstable => "/_matrix/client/unstable/keys/device_signing/upload",
+            1.0 => "/_matrix/client/r0/keys/device_signing/upload",
             1.1 => "/_matrix/client/v3/keys/device_signing/upload",
         }
     };
diff --git a/crates/ruma-client-api/src/knock/knock_room.rs b/crates/ruma-client-api/src/knock/knock_room.rs
index ae69319e..979f20da 100644
--- a/crates/ruma-client-api/src/knock/knock_room.rs
+++ b/crates/ruma-client-api/src/knock/knock_room.rs
@@ -18,6 +18,7 @@ pub mod v3 {
         authentication: AccessToken,
         history: {
             unstable => "/_matrix/client/unstable/xyz.amorgan.knock/knock/:room_id_or_alias",
+            1.0 => "/_matrix/client/r0/knock/:room_id_or_alias",
             1.1 => "/_matrix/client/v3/knock/:room_id_or_alias",
         }
     };
diff --git a/crates/ruma-state-res/src/event_auth.rs b/crates/ruma-state-res/src/event_auth.rs
index 720c9f07..7fec21f3 100644
--- a/crates/ruma-state-res/src/event_auth.rs
+++ b/crates/ruma-state-res/src/event_auth.rs
@@ -18,7 +18,7 @@ use serde::{
     Deserialize,
 };
 use serde_json::{from_str as from_json_str, value::RawValue as RawJsonValue};
-use tracing::{debug, trace, error, warn};
+use tracing::{debug, error, trace, warn};
 
 use crate::{
     power_levels::{