diff --git a/README b/README
index 920c24994..a4d1f5b4b 100644
--- a/README
+++ b/README
@@ -6,11 +6,11 @@ a semantic understanding of the database statements and the roles of
 the various servers within the backend cluster of databases.
 
 MaxScale is designed to provide load balancing and high availability
-functionality transparantly to the applications. In addition it provides
+functionality transparently to the applications. In addition it provides
 a highly scalable and flexibile architecture, with plugin components to
 support different protocols and routing decissions.
 
-MaxScale is implemented in C and makes entensive use of the
+MaxScale is implemented in C and makes extensive use of the
 asynchronous I/O capabilities of the Linux operating system. The epoll
 system is used to provide the event driven framework for the input and
 output via sockets.
@@ -47,13 +47,13 @@ MariaDB-5.5.34-centos6-x86_64-common.rpm
 MariaDB-5.5.34-centos6-x86_64-compat.rpm
 MariaDB-5.5.34-centos6-x86_64-devel.rpm
 
-Please backup any existent my.cnf file before installing the RPMs
+Please backup any existing my.cnf file before installing the RPMs
 
 Install the RPM files using:
 
 	rpm -i MariaDB-5.5.34-centos6-x86_64-common.rpm MariaDB-5.5.34-centos6-x86_64-compat.rpm MariaDB-5.5.34-centos6-x86_64-devel.rpm
 
-Note, if you wish to relocate the package to avoid an exisitng MariaDB
+Note, if you wish to relocate the package to avoid an existing MariaDB
 or MySQL installation you will need to use the --force option in addition
 to the --relocate option.
 
@@ -94,7 +94,7 @@ Example:
 
 
 Please note the errmsg.sys file is NOT included in the RPMs at the
-curent time, it must be taken from an existing MariaDB setup. The
+current time, it must be taken from an existing MariaDB setup. The
 version of the errmsg.sys file must match the version of the developer
 package you are using. A version mismatch will cause the library to fail
 to initialise.
diff --git a/server/core/dbusers.c b/server/core/dbusers.c
index 8bdee800a..5d6f19348 100644
--- a/server/core/dbusers.c
+++ b/server/core/dbusers.c
@@ -981,17 +981,6 @@ char *mysql_format_user_entry(void *data)
 		inet_ntop(AF_INET, &(entry->ipv4).sin_addr, mysql_user+strlen(mysql_user), INET_ADDRSTRLEN);
 	}
 
-	if (entry->resource) {
-		if (strlen(entry->resource)) {
-			strcat(mysql_user, " db: ");
-			strcat(mysql_user, entry->resource);
-		} else {
-			strcat(mysql_user, " db: ANY");
-		}
-	} else {
-		strcat(mysql_user, " no db");
-	}
-
         return mysql_user;
 }
 
diff --git a/server/modules/monitor/galera_mon.c b/server/modules/monitor/galera_mon.c
index 02a646aa2..ce2900e4a 100644
--- a/server/modules/monitor/galera_mon.c
+++ b/server/modules/monitor/galera_mon.c
@@ -454,7 +454,7 @@ size_t nrounds = 0;
 		 * round.
 		 */ 
 		if (nrounds != 0 && 
-			((nrounds*MON_BASE_INTERVAL_MS)%handle->interval) > 
+			((nrounds*MON_BASE_INTERVAL_MS)%handle->interval) >= 
 			MON_BASE_INTERVAL_MS) 
 		{
 			nrounds += 1;
diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index 7dd237ac2..5050f3e85 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -618,7 +618,7 @@ size_t nrounds = 0;
 		 * round.
 		 */
 		if (nrounds != 0 && 
-			((nrounds*MON_BASE_INTERVAL_MS)%handle->interval) > 
+			((nrounds*MON_BASE_INTERVAL_MS)%handle->interval) >= 
 			MON_BASE_INTERVAL_MS) 
 		{
 			nrounds += 1;
@@ -861,8 +861,8 @@ static void set_master_heartbeat(MYSQL_MONITOR *handle, MONITOR_SERVERS *databas
 	unsigned long id = handle->id;
 	time_t heartbeat;
 	time_t purge_time;
-	char heartbeat_insert_query[128]="";
-	char heartbeat_purge_query[128]="";
+	char heartbeat_insert_query[512]="";
+	char heartbeat_purge_query[512]="";
 
 	/* create the maxscale_schema database */
 	if (mysql_query(database->con, "CREATE DATABASE IF NOT EXISTS maxscale_schema")) {
diff --git a/server/modules/monitor/ndbcluster_mon.c b/server/modules/monitor/ndbcluster_mon.c
index 1997f274e..660179ef1 100644
--- a/server/modules/monitor/ndbcluster_mon.c
+++ b/server/modules/monitor/ndbcluster_mon.c
@@ -452,7 +452,7 @@ size_t nrounds = 0;
 		 * round.
 		 */ 
 		if (nrounds != 0 && 
-			((nrounds*MON_BASE_INTERVAL_MS)%handle->interval) > 
+			((nrounds*MON_BASE_INTERVAL_MS)%handle->interval) >= 
 			MON_BASE_INTERVAL_MS) 
 		{
 			nrounds += 1;