diff --git a/src/network/NetworkKey.cpp b/src/network/NetworkKey.cpp
index d372fd3422..82b7fecb7d 100644
--- a/src/network/NetworkKey.cpp
+++ b/src/network/NetworkKey.cpp
@@ -89,8 +89,8 @@ bool NetworkKey::Generate()
 
 bool NetworkKey::LoadPrivate(SDL_RWops * file)
 {
-    int64_t size = file->size(file);
-    if (size == -1) {
+    size_t size = (size_t)file->size(file);
+    if (size == (size_t)-1) {
         log_error("unknown size, refusing to load key");
         return false;
     }
@@ -131,8 +131,8 @@ bool NetworkKey::LoadPrivate(SDL_RWops * file)
 
 bool NetworkKey::LoadPublic(SDL_RWops * file)
 {
-    int64_t size = file->size(file);
-    if (size == -1)
+    size_t size = (size_t)file->size(file);
+    if (size == (size_t)-1)
     {
         log_error("unknown size, refusing to load key");
         return false;
@@ -324,7 +324,7 @@ std::string NetworkKey::PublicKeyHash()
     EVP_DigestFinal(ctx, digest.data(), &digest_size);
     std::string digest_out;
     digest_out.reserve(EVP_MAX_MD_SIZE * 2 + 1);
-    for (int i = 0; i < digest_size; i++)
+    for (unsigned int i = 0; i < digest_size; i++)
     {
         char buf[3];
         sprintf(buf, "%02x", digest[i]);
@@ -333,7 +333,7 @@ std::string NetworkKey::PublicKeyHash()
     return digest_out;
 }
 
-bool NetworkKey::Sign(const char * md, const size_t len, char ** signature, unsigned int * out_size)
+bool NetworkKey::Sign(const char * md, const size_t len, char ** signature, size_t * out_size)
 {
     EVP_MD_CTX * mdctx = nullptr;
 
diff --git a/src/network/NetworkKey.h b/src/network/NetworkKey.h
index 1cc30a8d95..c29c5d29e1 100644
--- a/src/network/NetworkKey.h
+++ b/src/network/NetworkKey.h
@@ -38,7 +38,7 @@ public:
     std::string PublicKeyString();
     std::string PublicKeyHash();
     void Unload();
-    bool Sign(const char * md, const size_t len, char ** signature, unsigned int * out_size);
+    bool Sign(const char * md, const size_t len, char ** signature, size_t * out_size);
     bool Verify(const char * md, const size_t len, const char * sig, const size_t siglen);
 private:
     NetworkKey ( const NetworkKey & ) = delete;
diff --git a/src/network/network.cpp b/src/network/network.cpp
index 7c104306f6..42a86b7c1c 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -1447,7 +1447,7 @@ void Network::LoadKeyMappings()
 	for (size_t i = 0; i < groupCount; i++) {
 		json_t * jsonKeyMapping = json_array_get(jsonKeyMappings, i);
 		std::string hash(json_string_value(json_object_get(jsonKeyMapping, "hash")));
-		key_group_map[hash] = json_integer_value(json_object_get(jsonKeyMapping, "groupId"));
+		key_group_map[hash] = (uint8)json_integer_value(json_object_get(jsonKeyMapping, "groupId"));
 	}
 	json_decref(jsonKeyMappings);
 }
@@ -1879,7 +1879,7 @@ void Network::Client_Handle_TOKEN(NetworkConnection& connection, NetworkPacket&
 	uint32 challenge_size;
 	packet >> challenge_size;
 	const char *challenge = (const char *)packet.Read(challenge_size);
-	uint32 sigsize;
+	size_t sigsize;
 	char *signature;
 	const std::string pubkey = key.PublicKeyString();
 	bool ok = key.Sign(challenge, challenge_size, &signature, &sigsize);
@@ -2713,7 +2713,7 @@ void network_send_password(const char* password)
 	// TODO: verify file exists
 	gNetwork.key.LoadPrivate(privkey);
 	const std::string pubkey = gNetwork.key.PublicKeyString();
-	uint32 sigsize;
+	size_t sigsize;
 	char *signature;
 	bool ok = gNetwork.key.Sign(gNetwork.challenge.c_str(), gNetwork.challenge.size(), &signature, &sigsize);
 	log_warning("sigsize = %u, strlen(signature) = %u, signature = %s", sigsize, strlen(signature), signature);