diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt
index aa9cf19e1..a599c4e5e 100644
--- a/server/core/CMakeLists.txt
+++ b/server/core/CMakeLists.txt
@@ -20,7 +20,8 @@ add_library(maxscale-common SHARED
   mlist.cc
   modutil.cc
   monitor.cc
-  queuemanager.c query_classifier.cc poll.c random_jkiss.c resultset.c router.cc secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c skygw_utils.cc statistics.c listener.c ssl.c mysql_utils.c mysql_binlog.c modulecmd.c)
+  queuemanager.cc
+  query_classifier.cc poll.c random_jkiss.c resultset.c router.cc secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c skygw_utils.cc statistics.c listener.c ssl.c mysql_utils.c mysql_binlog.c modulecmd.c)
 
 if(WITH_JEMALLOC)
   target_link_libraries(maxscale-common ${JEMALLOC_LIBRARIES})
diff --git a/server/core/queuemanager.c b/server/core/queuemanager.cc
similarity index 98%
rename from server/core/queuemanager.c
rename to server/core/queuemanager.cc
index 7515487b9..72c2a1d37 100644
--- a/server/core/queuemanager.c
+++ b/server/core/queuemanager.cc
@@ -60,7 +60,7 @@ QUEUE_CONFIG
     QUEUE_CONFIG *new_queue = (QUEUE_CONFIG *)MXS_CALLOC(1, sizeof(QUEUE_CONFIG));
     if (new_queue)
     {
-        new_queue->queue_array = MXS_CALLOC(limit + 1, sizeof(QUEUE_ENTRY));
+        new_queue->queue_array = (QUEUE_ENTRY*)MXS_CALLOC(limit + 1, sizeof(QUEUE_ENTRY));
         if (new_queue->queue_array)
         {
             new_queue->queue_limit = limit;
@@ -226,4 +226,4 @@ static inline int mxs_queue_count(QUEUE_CONFIG *queue_config)
 {
     int count = queue_config->end - queue_config->start;
     return count < 0 ? (count + queue_config->queue_limit + 1) : count;
-}
\ No newline at end of file
+}