diff --git a/server/core/gateway.c b/server/core/gateway.c
index 0907d6365..f0744cfd1 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -1670,7 +1670,7 @@ int main(int argc, char **argv)
             if(!daemon_mode)
             {
                 strncat(errorbuffer, "\n", STRING_BUFFER_SIZE);
-                fprintf(stderr, errorbuffer);
+                fprintf(stderr, "%s", errorbuffer);
             }
 
 	    rc = MAXSCALE_BADCONFIG;
diff --git a/server/core/test/testmemlog.c b/server/core/test/testmemlog.c
index 1523ec8ec..d1cad08ae 100644
--- a/server/core/test/testmemlog.c
+++ b/server/core/test/testmemlog.c
@@ -67,7 +67,7 @@ int
 main()
 {
 MEMLOG		*log, *log2;
-int		i;
+long int	i;
 long		j;
 long long	k;
 int		failures = 0;
diff --git a/server/core/test/testspinlock.c b/server/core/test/testspinlock.c
index 14501cea5..ed8fa7214 100644
--- a/server/core/test/testspinlock.c
+++ b/server/core/test/testspinlock.c
@@ -151,11 +151,14 @@ test3_helper(void *data)
 // SPINLOCK   *lck = (SPINLOCK *)data;
 int         i;
 int         n = *(int *)data;
-struct timespec sleeptime;
 time_t          rawtime;
 
+#if defined(ADD_SOME_NANOSLEEP)
+struct timespec sleeptime;
+
     sleeptime.tv_sec = 0;
     sleeptime.tv_nsec = 1;
+#endif
 
     while (1) {
         if (spinlock_acquire_nowait(&lck)) {
@@ -185,7 +188,9 @@ time_t          rawtime;
         active = 0;
         spinlock_release(&lck);
         for (i=0; i<(4*PROCESS_LOOP); i++);
-        // nanosleep(&sleeptime, NULL);
+#if defined(ADD_SOME_NANOSLEEP)
+        nanosleep(&sleeptime, NULL);
+#endif
     }
     spinlock_release(&lck);
 }
@@ -199,11 +204,6 @@ int             i;
 int             tnum[THREADS];
 time_t          rawtime;
 
-struct timespec sleeptime;
-
-    sleeptime.tv_sec = 20;
-    sleeptime.tv_nsec = NANOTIME;
-
     times_run = 0;
     active = 0;
     failures = 0;
diff --git a/server/modules/protocol/mysql_common.c b/server/modules/protocol/mysql_common.c
index b3dfc37be..354820d4a 100644
--- a/server/modules/protocol/mysql_common.c
+++ b/server/modules/protocol/mysql_common.c
@@ -2261,7 +2261,7 @@ char *create_auth_fail_str(
 	}
 	else if(errcode == MYSQL_FAILED_AUTH_SSL)
 	{
-	    sprintf(errstr, ferrstr);
+	    sprintf(errstr, "%s", ferrstr);
 	}
 	else
 	{