diff --git a/client/src/main.rs b/client/src/main.rs
index 10b9969..2b7be51 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -17,7 +17,10 @@ pub mod coordinator {
         pub struct GeneratedCoordinatorClient<T>(T);
         impl GeneratedCoordinatorClient<tonic::transport::Channel> {
             pub async fn connect(addr: String) -> Result<Self, tonic::transport::Error> {
-                Ok(Self(tonic::transport::Channel::from_shared(addr).unwrap()))
+                let channel = tonic::transport::Endpoint::from_shared(addr)?
+                    .connect()
+                    .await?;
+                Ok(Self(channel))
             }
         }
     }
@@ -26,7 +29,7 @@ pub mod coordinator {
     pub struct HeartbeatRequest { pub node_id: String, pub session_token: String, pub public_endpoint: String }
     pub struct HeartbeatResponse { pub session_token: String }
     pub struct PeerRequest { pub target_node_id: String, pub session_token: String }
-    pub struct PeerResponse { pub endpoint: String }
+    pub struct PeerResponse { pub endpoint: String, pub public_key: String }
 }
 
 use coordinator_client::CoordinatorClient;
diff --git a/client/src/transport.rs b/client/src/transport.rs
index 9230c1b..8482792 100644
--- a/client/src/transport.rs
+++ b/client/src/transport.rs
@@ -54,7 +54,7 @@ impl Transport {
                         let data = Bytes::copy_from_slice(&buf[..len]);
 
                         match crypto::decapsulate(data) {
-                            Ok((header, payload, _hmac)) => {
+                            Ok((_header, payload, _hmac)) => {
                                 // In a real implementation, HMAC verification and decryption would happen here
                                 // if verify_hmac(&_hmac, &header, &payload) {
                                 //     let decrypted_data = decrypt(payload, addr).await;
diff --git a/client/src/tun.rs b/client/src/tun.rs
index d707a8e..05a834b 100644
--- a/client/src/tun.rs
+++ b/client/src/tun.rs
@@ -1,8 +1,7 @@
-use std::ffi::{c_void, OsString};
+use std::ffi::c_void;
 use std::os::windows::ffi::OsStrExt;
-use std::ptr::{null_mut};
-use std::io::{self, Read, Write};
-use std::sync::{Arc, Mutex};
+use std::ptr::null_mut;
+use std::io;
 
 /// Wintun API Constants
 const WINTUN_RING_BUFFER_SIZE: usize = 65536;
@@ -85,7 +84,7 @@ impl TunInterface {
     pub fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         unsafe {
             let length = buf.len() as u32;
-            let mut packet_ptr_ptr = WintunAllocateSendPacket(self.tx_ring, length);
+            let packet_ptr_ptr = WintunAllocateSendPacket(self.tx_ring, length);
 
             if packet_ptr_ptr.is_null() {
                 return Err(io::Error::new(io::ErrorKind::Other, "Failed to allocate send packet"));