diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getAccountInfo.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getAccountInfo.kt
index 0ba1445..5f3bcc4 100644
--- a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getAccountInfo.kt
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getAccountInfo.kt
@@ -8,13 +8,14 @@ import kotlinx.serialization.json.buildJsonArray
 import kotlinx.serialization.json.put
 import net.avianlabs.solana.SolanaClient
 import net.avianlabs.solana.client.Response
+import net.avianlabs.solana.client.Response.RPC
 import net.avianlabs.solana.domain.core.Commitment
 import net.avianlabs.solana.tweetnacl.ed25519.PublicKey
 
 public suspend fun SolanaClient.getAccountInfo(
   publicKey: PublicKey,
   commitment: Commitment? = null,
-): Response<Response.RPC<AccountInfo>> = invoke(
+): Response<RPC<AccountInfo?>> = invoke(
   method = "getAccountInfo",
   params = buildJsonArray {
     add(publicKey.toBase58())
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getFeeForMessage.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getFeeForMessage.kt
index 023413a..bba535b 100644
--- a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getFeeForMessage.kt
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getFeeForMessage.kt
@@ -20,7 +20,7 @@ import net.avianlabs.solana.domain.core.Commitment
 public suspend fun SolanaClient.getFeeForMessage(
   message: ByteArray,
   commitment: Commitment? = null
-): Response<RPC<Long>> = invoke(
+): Response<RPC<Long?>> = invoke(
   method = "getFeeForMessage",
   params = buildJsonArray {
     add(message.encodeBase64())
diff --git a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getTokenAccountBalance.kt b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getTokenAccountBalance.kt
index 2df1664..23741e0 100644
--- a/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getTokenAccountBalance.kt
+++ b/solana-kotlin/src/commonMain/kotlin/net/avianlabs/solana/methods/getTokenAccountBalance.kt
@@ -21,7 +21,7 @@ import net.avianlabs.solana.tweetnacl.ed25519.PublicKey
 public suspend fun SolanaClient.getTokenAccountBalance(
   tokenAccount: PublicKey,
   commitment: Commitment? = null,
-): Response<RPC<TokenAmountInfo>> = invoke(
+): Response<RPC<TokenAmountInfo?>> = invoke(
   method = "getTokenAccountBalance",
   params = buildJsonArray {
     add(tokenAccount.toBase58())