diff --git a/server/core/test/test_logthrottling.cc b/server/core/test/test_logthrottling.cc
index 0e584cf1c..eda19665b 100644
--- a/server/core/test/test_logthrottling.cc
+++ b/server/core/test/test_logthrottling.cc
@@ -111,7 +111,7 @@ bool run(const MXS_LOG_THROTTLING& throttling, int priority, size_t n_generate,
     mxs_log_set_throttling(&throttling); // Causes message to be logged.
     mxs_log_flush_sync();
 
-    ifstream in(logfile);
+    ifstream in(logfile.c_str());
     in.seekg(0, ios_base::end);
 
     THREAD_ARG args[N_THREADS];
@@ -172,7 +172,7 @@ int main(int argc, char* argv[])
     char tmpbuf[] = "/tmp/maxscale_test_logthrottling_XXXXXX";
     char* logdir = mkdtemp(tmpbuf);
     ensure(logdir);
-    logfile.assign(string{logdir} + '/' + LOGNAME);
+    logfile.assign(string(logdir) + '/' + LOGNAME);
 
     if (mxs_log_init(NULL, logdir, MXS_LOG_TARGET_FS))
     {
diff --git a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
index 6a1f12ff0..8aaa0d1ea 100644
--- a/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
@@ -229,7 +229,7 @@ int MySQLSendHandshake(DCB* dcb)
     {
         mysql_server_language = dcb->service->dbref->server->charset;
 
-        if (strstr(dcb->service->dbref->server->version_string, "10.2."))
+        if (dcb->service->dbref->server->version >= 100200)
         {
             /** The backend servers support the extended capabilities */
             is_maria = true;