diff --git a/query_classifier/qc_sqlite/qc_sqlite.cc b/query_classifier/qc_sqlite/qc_sqlite.cc
index a794d373a..ccd7ae386 100644
--- a/query_classifier/qc_sqlite/qc_sqlite.cc
+++ b/query_classifier/qc_sqlite/qc_sqlite.cc
@@ -139,7 +139,7 @@ static bool is_sequence_related_function(QcSqliteInfo* info, const char* func_na
 static void log_invalid_data(GWBUF* query, const char* message);
 static const char* map_function_name(QC_NAME_MAPPING* function_name_mappings, const char* name);
 static bool parse_query(GWBUF* query, uint32_t collect);
-static void parse_query_string(const char* query, size_t len);
+static void parse_query_string(const char* query, int len);
 static bool query_is_parsed(GWBUF* query, uint32_t collect);
 static bool should_exclude(const char* zName, const ExprList* pExclude);
 static void update_field_info(QcSqliteInfo* info,
@@ -736,7 +736,7 @@ static bool ensure_query_is_parsed(GWBUF* query, uint32_t collect)
     return parsed;
 }
 
-static void parse_query_string(const char* query, size_t len)
+static void parse_query_string(const char* query, int len)
 {
     sqlite3_stmt* stmt = NULL;
     const char* tail = NULL;
diff --git a/server/core/adminusers.cc b/server/core/adminusers.cc
index 2fc09a03f..dd5070629 100644
--- a/server/core/adminusers.cc
+++ b/server/core/adminusers.cc
@@ -518,7 +518,7 @@ bool admin_linux_account_enabled(const char *uname)
 void mxs_crypt(const char* password, const char* salt, char* output)
 {
 #if HAVE_GLIBC
-    thread_local struct crypt_data cdata;
+    struct crypt_data cdata;
     cdata.initialized = 0;
     char* pw = crypt_r(password, salt, &cdata);
     snprintf(output, MXS_CRYPT_SIZE, "%s", pw);