diff --git a/libmariadb/ma_string.c b/libmariadb/ma_string.c
index 7eb95554..9a62e06e 100644
--- a/libmariadb/ma_string.c
+++ b/libmariadb/ma_string.c
@@ -96,8 +96,8 @@ my_bool ma_dynstr_append_quoted(DYNAMIC_STRING *str,
                              const char *append, size_t len,
                              char quote)
 {
-  uint additional= str->alloc_increment;
-  uint lim= additional;
+  size_t additional= str->alloc_increment;
+  size_t lim= additional;
   uint i;
 
   if (ma_dynstr_realloc(str, len + additional + 2))
diff --git a/plugins/auth/sha256_pw.c b/plugins/auth/sha256_pw.c
index 2c3afa6b..81b5c992 100644
--- a/plugins/auth/sha256_pw.c
+++ b/plugins/auth/sha256_pw.c
@@ -142,7 +142,7 @@ char *load_pub_key_file(const char *filename, int *pub_key_size)
   if (bytes_read < (size_t)fsize)
     goto end;
 
-  *pub_key_size= bytes_read;
+  *pub_key_size= (int)bytes_read;
 
   error= 0;