diff --git a/dotnet/src/ZB.MOM.NatsNet.Server/Accounts/Account.cs b/dotnet/src/ZB.MOM.NatsNet.Server/Accounts/Account.cs
index 9718c11..a9536c4 100644
--- a/dotnet/src/ZB.MOM.NatsNet.Server/Accounts/Account.cs
+++ b/dotnet/src/ZB.MOM.NatsNet.Server/Accounts/Account.cs
@@ -2279,7 +2279,7 @@ public sealed class Account : INatsAccount
         }
 
         if (sid is { Length: > 0 } && InternalClient != null)
-            InternalClient.ProcessUnsub(sid);
+            InternalClient.RemoveSubBySid(sid);
 
         if (tracking && requestor != null && !delivered)
             SendBackendErrorTrackingLatency(serviceImport, reason);
@@ -2355,7 +2355,7 @@ public sealed class Account : INatsAccount
         }
 
         if (sid != null && InternalClient != null)
-            InternalClient.ProcessUnsub(sid);
+            InternalClient.RemoveSubBySid(sid);
     }
 
     /// <summary>
@@ -2548,7 +2548,7 @@ public sealed class Account : INatsAccount
         if (InternalClient == null && Server is NatsServer server)
         {
             InternalClient = server.CreateInternalAccountClient();
-            InternalClient.Account = this;
+            InternalClient.SetAccount(this);
         }
 
         return InternalClient;
@@ -2573,7 +2573,7 @@ public sealed class Account : INatsAccount
         _mu.EnterReadLock();
         var internalClient = InternalClient;
         _mu.ExitReadLock();
-        internalClient?.ProcessUnsub(sub.Sid);
+        internalClient?.RemoveSubBySid(sub.Sid);
     }
 
     /// <summary>
@@ -2685,7 +2685,7 @@ public sealed class Account : INatsAccount
             return;
 
         foreach (var sid in subscriptionIds)
-            internalClient.ProcessUnsub(sid);
+            internalClient.RemoveSubBySid(sid);
 
         internalClient.CloseConnection(ClosedState.InternalClient);
     }
@@ -4170,7 +4170,7 @@ public sealed class Account : INatsAccount
         return new ClientInfo
         {
             Id = client.Cid,
-            Account = client.Account?.Name ?? string.Empty,
+            Account = client.Account()?.Name ?? string.Empty,
             Name = client.Opts.Name ?? string.Empty,
             Rtt = client.GetRttValue(),
             Start = client.Start == default ? string.Empty : client.Start.ToUniversalTime().ToString("O"),
diff --git a/dotnet/src/ZB.MOM.NatsNet.Server/ClientConnection.cs b/dotnet/src/ZB.MOM.NatsNet.Server/ClientConnection.cs
index 7888792..9066d2e 100644
--- a/dotnet/src/ZB.MOM.NatsNet.Server/ClientConnection.cs
+++ b/dotnet/src/ZB.MOM.NatsNet.Server/ClientConnection.cs
@@ -1686,7 +1686,7 @@ public sealed partial class ClientConnection
         }
     }
 
-    internal void ProcessUnsub(byte[] sid)
+    internal void RemoveSubBySid(byte[] sid)
     {
         lock (_mu)
         {
diff --git a/porting.db b/porting.db
index 4e827a7..dc90e94 100644
Binary files a/porting.db and b/porting.db differ