diff --git a/lib/services/vpn_session_service.dart b/lib/services/vpn_session_service.dart
index 94e7b32..927345c 100644
--- a/lib/services/vpn_session_service.dart
+++ b/lib/services/vpn_session_service.dart
@@ -15,7 +15,7 @@ class VpnSessionService {
         return;
       }
       
-      // Get all sessions for this server with peer info
+      // Get all sessions for this server
       final sessions = await SUPABASE_CLIENT
           .from('vpn_sessions')
           .select('id, peer_info')
@@ -30,13 +30,13 @@ class VpnSessionService {
           final sessionId = session['id'];
           final peerInfo = session['peer_info'];
           
-          if (peerInfo != null && peerInfo['public_key'] != null) {
-            final publicKey = peerInfo['public_key'] as String;
+          if (peerInfo != null && peerInfo['peer'] != null && peerInfo['peer']['publicKey'] != null) {
+            final publicKey = peerInfo['peer']['publicKey'] as String;
             final keepaliveInfo = await _getKeepaliveForPeer(publicKey);
             
             print('Session ID: $sessionId - Peer: ${publicKey.substring(0, 8)}... - $keepaliveInfo');
           } else {
-            print('Session ID: $sessionId - No peer info available');
+            print('Session ID: $sessionId - No peer public key available');
           }
         }
       }
@@ -70,10 +70,8 @@ class VpnSessionService {
             return 'No handshake yet';
           } else {
             final handshakeDateTime = DateTime.fromMillisecondsSinceEpoch(handshakeTime * 1000);
-            final now = DateTime.now();
-            final timeSince = now.difference(handshakeDateTime);
             
-            return 'Last keepalive ${timeSince.inSeconds}s ago';
+            return 'Last handshake: ${handshakeDateTime.toLocal()}';
           }
         }
       }