diff --git a/src/raw/client.rs b/src/raw/client.rs
index be818c63..109008ab 100644
--- a/src/raw/client.rs
+++ b/src/raw/client.rs
@@ -297,9 +297,9 @@ impl<PdC: PdClient> Client<PdC> {
     /// # });
     pub async fn get_key_ttl_secs(&self, key: impl Into<Key>) -> Result<Option<u64>> {
         debug!("invoking raw get_key_ttl_secs request");
-        let key = key.into().encode_version(self.api_version, KeyMode::Raw);
+        let key = key.into().encode_keyspace(self.keyspace, KeyMode::Raw);
         let request = new_raw_get_key_ttl_request(key, self.cf.clone());
-        let plan = crate::request::PlanBuilder::new(self.rpc.clone(), self.api_version, request)
+        let plan = crate::request::PlanBuilder::new(self.rpc.clone(), self.keyspace, request)
             .retry_multi_region(self.backoff.clone())
             .merge(CollectSingle)
             .post_process_default()
diff --git a/src/transaction/client.rs b/src/transaction/client.rs
index eb9cc91b..7aa73139 100644
--- a/src/transaction/client.rs
+++ b/src/transaction/client.rs
@@ -111,8 +111,8 @@ impl Client {
         let pd = Arc::new(PdRpcClient::connect(&pd_endpoints, config.clone(), true).await?);
         let keyspace = match config.keyspace {
             Some(keyspace) => {
-                let keyspace_id = pd.get_keyspace_id(&keyspace).await?;
-                Keyspace::Enable { keyspace_id }
+                let keyspace = pd.load_keyspace(&keyspace).await?;
+                Keyspace::Enable { keyspace_id: keyspace.id }
             }
             None => Keyspace::Disable,
         };