diff --git a/server/modules/authenticator/MySQLAuth/dbusers.c b/server/modules/authenticator/MySQLAuth/dbusers.c
index 778fc0324..25719fa70 100644
--- a/server/modules/authenticator/MySQLAuth/dbusers.c
+++ b/server/modules/authenticator/MySQLAuth/dbusers.c
@@ -524,8 +524,7 @@ static bool check_server_permissions(SERVICE *service, SERVER* server,
 
     if (server->version_string[0] == 0)
     {
-        const char *version_string = mysql_get_server_info(mysql);
-        server_set_version_string(server, version_string);
+        mxs_mysql_set_server_version(mysql, server);
     }
 
     const char *template = "SELECT user, host, %s, Select_priv FROM mysql.user limit 1";
@@ -730,8 +729,7 @@ int get_users_from_server(MYSQL *con, SERVER_REF *server_ref, SERVICE *service,
 {
     if (server_ref->server->version_string[0] == 0)
     {
-        const char *version_string = mysql_get_server_info(con);
-        server_set_version_string(server_ref->server, version_string);
+        mxs_mysql_set_server_version(con, server_ref->server);
     }
 
     char *query = get_new_users_query(server_ref->server->version_string, service->enable_root);
diff --git a/server/modules/monitor/galeramon/galeramon.c b/server/modules/monitor/galeramon/galeramon.c
index 93d1d8d3d..11249efb5 100644
--- a/server/modules/monitor/galeramon/galeramon.c
+++ b/server/modules/monitor/galeramon/galeramon.c
@@ -13,31 +13,14 @@
 
 /**
  * @file galera_mon.c - A MySQL Galera cluster monitor
- *
- * @verbatim
- * Revision History
- *
- * Date     Who                 Description
- * 22/07/13 Mark Riddoch        Initial implementation
- * 21/05/14 Massimiliano Pinto  Monitor sets a master server that has the lowest value of wsrep_local_index
- * 23/05/14 Massimiliano Pinto  Added 1 configuration option (setInterval). Interval is printed in diagnostics.
- * 03/06/14 Mark Riddoch        Add support for maintenance mode
- * 24/06/14 Massimiliano Pinto  Added depth level 0 for each node
- * 30/10/14 Massimiliano Pinto  Added disableMasterFailback feature
- * 10/11/14 Massimiliano Pinto  Added setNetworkTimeout for connect,read,write
- * 20/04/15 Guillaume Lefranc   Added availableWhenDonor feature
- * 22/04/15 Martin Brampton     Addition of disableMasterRoleSetting
- * 08/05/15 Markus Makela       Addition of launchable scripts
- * 17/10/15 Martin Brampton     Change DCB callback to hangup
- *
- * @endverbatim
  */
 
 #define MXS_MODULE_NAME "galeramon"
 
 #include "galeramon.h"
-#include <maxscale/dcb.h>
 #include <maxscale/alloc.h>
+#include <maxscale/dcb.h>
+#include <maxscale/mysql_utils.h>
 
 #define DONOR_NODE_NAME_MAX_LEN 60
 #define DONOR_LIST_SET_VAR "SET GLOBAL wsrep_sst_donor = \""
@@ -331,11 +314,8 @@ monitorDatabase(MXS_MONITOR *mon, MXS_MONITOR_SERVERS *database)
     server_set_status_nolock(database->server, SERVER_RUNNING);
 
     /* get server version string */
-    server_string = (char *) mysql_get_server_info(database->con);
-    if (server_string)
-    {
-        server_set_version_string(database->server, server_string);
-    }
+    mxs_mysql_set_server_version(database->con, database->server);
+    server_string = database->server->server_string;
 
     /* Check if the the Galera FSM shows this node is joined to the cluster */
     char *cluster_member = "SHOW STATUS WHERE Variable_name IN"
diff --git a/server/modules/monitor/mysqlmon/mysql_mon.c b/server/modules/monitor/mysqlmon/mysql_mon.c
index 8a0547c51..657ccb3ba 100644
--- a/server/modules/monitor/mysqlmon/mysql_mon.c
+++ b/server/modules/monitor/mysqlmon/mysql_mon.c
@@ -18,10 +18,11 @@
 #define MXS_MODULE_NAME "mysqlmon"
 
 #include "../mysqlmon.h"
-#include <maxscale/dcb.h>
-#include <maxscale/modutil.h>
 #include <maxscale/alloc.h>
+#include <maxscale/dcb.h>
 #include <maxscale/debug.h>
+#include <maxscale/modutil.h>
+#include <maxscale/mysql_utils.h>
 
 #define DEFAULT_JOURNAL_MAX_AGE "28800"
 
@@ -726,11 +727,8 @@ monitorDatabase(MXS_MONITOR *mon, MXS_MONITOR_SERVERS *database)
     server_version = mysql_get_server_version(database->con);
 
     /* get server version string */
-    server_string = (char *) mysql_get_server_info(database->con);
-    if (server_string)
-    {
-        server_set_version_string(database->server, server_string);
-    }
+    mxs_mysql_set_server_version(database->con, database->server);
+    server_string = database->server->server_string;
 
     MYSQL_SERVER_INFO *serv_info = hashtable_fetch(handle->server_info, database->server->unique_name);
     ss_dassert(serv_info);
diff --git a/server/modules/monitor/ndbclustermon/ndbclustermon.c b/server/modules/monitor/ndbclustermon/ndbclustermon.c
index 7840fe5ac..bbbe655ed 100644
--- a/server/modules/monitor/ndbclustermon/ndbclustermon.c
+++ b/server/modules/monitor/ndbclustermon/ndbclustermon.c
@@ -13,22 +13,13 @@
 
 /**
  * @file ndbcluster_mon.c - A MySQL cluster SQL node monitor
- *
- * @verbatim
- * Revision History
- *
- * Date     Who                 Description
- * 25/07/14 Massimiliano Pinto  Initial implementation
- * 10/11/14 Massimiliano Pinto  Added setNetworkTimeout for connect,read,write
- * 08/05/15 Markus Makela       Addition of launchable scripts
- *
- * @endverbatim
  */
 
 #define MXS_MODULE_NAME "ndbclustermon"
 
 #include "../mysqlmon.h"
 #include <maxscale/alloc.h>
+#include <maxscale/mysql_utils.h>
 
 static void monitorMain(void *);
 
@@ -234,11 +225,8 @@ monitorDatabase(MXS_MONITOR_SERVERS *database, char *defaultUser, char *defaultP
     server_set_status_nolock(database->server, SERVER_RUNNING);
 
     /* get server version string */
-    server_string = (char *) mysql_get_server_info(database->con);
-    if (server_string)
-    {
-        server_set_version_string(database->server, server_string);
-    }
+    mxs_mysql_set_server_version(database->con, database->server);
+    server_string = database->server->server_string;
 
     /* Check if the the SQL node is able to contact one or more data nodes */
     if (mysql_query(database->con, "SHOW STATUS LIKE 'Ndb_number_of_ready_data_nodes'") == 0