diff --git a/src/dorkbox/network/Client.kt b/src/dorkbox/network/Client.kt
index fcdd8a3f..11fbd137 100644
--- a/src/dorkbox/network/Client.kt
+++ b/src/dorkbox/network/Client.kt
@@ -15,6 +15,7 @@
  */
 package dorkbox.network
 
+import dorkbox.bytes.toHexString
 import dorkbox.netUtil.*
 import dorkbox.network.aeron.AeronDriver
 import dorkbox.network.aeron.IpcMediaDriverConnection
@@ -27,7 +28,6 @@ import dorkbox.network.exceptions.ClientTimedOutException
 import dorkbox.network.handshake.ClientHandshake
 import dorkbox.network.ping.Ping
 import dorkbox.network.ping.PingManager
-import dorkbox.util.Sys
 import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -463,7 +463,7 @@ open class Client<CONNECTION : Connection>(
                 throw exception
             }
 
-            logger.info("Adding new signature for ${IP.toString(remoteAddress)} : ${Sys.bytesToHex(connectionInfo.publicKey)}")
+            logger.info("Adding new signature for ${IP.toString(remoteAddress)} : ${connectionInfo.publicKey.toHexString()}")
             storage.addRegisteredServerKey(remoteAddress, connectionInfo.publicKey)
         }
 
diff --git a/src/dorkbox/network/connection/CryptoManagement.kt b/src/dorkbox/network/connection/CryptoManagement.kt
index d08dcdbc..23dd4cbf 100644
--- a/src/dorkbox/network/connection/CryptoManagement.kt
+++ b/src/dorkbox/network/connection/CryptoManagement.kt
@@ -16,12 +16,12 @@
 package dorkbox.network.connection
 
 import dorkbox.bytes.Hash
+import dorkbox.bytes.toHexString
 import dorkbox.netUtil.IP
 import dorkbox.network.handshake.ClientConnectionInfo
 import dorkbox.network.serialization.AeronInput
 import dorkbox.network.serialization.AeronOutput
 import dorkbox.network.storage.SettingsStore
-import dorkbox.util.Sys
 import dorkbox.util.entropy.Entropy
 import dorkbox.util.exceptions.SecurityException
 import mu.KLogger
@@ -109,13 +109,15 @@ internal class CryptoManagement(val logger: KLogger,
             }
         }
 
-        logger.info("ECC public key: ${Sys.bytesToHex(publicKeyBytes)}")
+        publicKeyBytes!!
+
+        logger.info("ECC public key: ${publicKeyBytes.toHexString()}")
 
         this.publicKey = keyFactory.generatePublic(XECPublicKeySpec(X25519KeySpec, BigInteger(publicKeyBytes))) as XECPublicKey
         this.privateKey = keyFactory.generatePrivate(XECPrivateKeySpec(X25519KeySpec, privateKeyBytes)) as XECPrivateKey
 
         this.privateKeyBytes = privateKeyBytes!!
-        this.publicKeyBytes = publicKeyBytes!!
+        this.publicKeyBytes = publicKeyBytes
     }
 
     private fun createKeyPair(secureRandom: SecureRandom): Pair<XECPublicKeySpec, XECPrivateKeySpec> {
diff --git a/src/dorkbox/network/serialization/KryoExtra.kt b/src/dorkbox/network/serialization/KryoExtra.kt
index 2c010312..cd92a1b9 100644
--- a/src/dorkbox/network/serialization/KryoExtra.kt
+++ b/src/dorkbox/network/serialization/KryoExtra.kt
@@ -237,7 +237,7 @@ class KryoExtra<CONNECTION: Connection>() : Kryo() {
 //        val compressedLength = compressor.compress(writer.buffer, 0, length, compressOutput, 0, maxCompressedLength)
 //
 //        if (DEBUG) {
-//            val orig = Sys.bytesToHex(writer.buffer, 0, length)
+//            val orig = Sys.bytesToHex(writer.buffer, 0, length) use String.toHexBytes() instead
 //            val compressed = Sys.bytesToHex(compressOutput, 0, compressedLength)
 //            logger.error(OS.LINE_SEPARATOR +
 //                         "ORIG: (" + length + ")" + OS.LINE_SEPARATOR + orig +