diff --git a/src/Protocol/Authenticator.cpp b/src/Protocol/Authenticator.cpp
index a79f0b7e0..8943b3c21 100644
--- a/src/Protocol/Authenticator.cpp
+++ b/src/Protocol/Authenticator.cpp
@@ -146,7 +146,7 @@ bool cAuthenticator::AuthWithYggdrasil(AString & a_UserName, const AString & a_S
 {
 	AString REQUEST;
 	int ret, server_fd = -1;
-	size_t len = -1;
+	size_t len = 0;
 	unsigned char buf[1024];
 	const char *pers = "cAuthenticator";
 
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index a4319df37..6c1af61fa 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -1559,7 +1559,7 @@ void cProtocol172::HandlePacketLoginEncryptionResponse(cByteBuffer & a_ByteBuffe
 	// Send login success:
 	{
 		cPacketizer Pkt(*this, 0x02);  // Login success packet
-		Pkt.WriteString(Printf("%d", m_Client->GetUniqueID()));  // TODO: proper UUID
+		Pkt.WriteString(m_Client->GetUUID());
 		Pkt.WriteString(m_Client->GetUsername());
 	}