diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt
index 43318d018..2dabf4d33 100644
--- a/server/core/CMakeLists.txt
+++ b/server/core/CMakeLists.txt
@@ -23,11 +23,11 @@ endif()
 target_link_libraries(maxscale ${EMBEDDED_LIB} ${PCRE_LINK_FLAGS} ${CURL_LIBRARIES} log_manager utils ssl aio pthread crypt dl crypto inih z rt m stdc++)
 install(TARGETS maxscale DESTINATION ${MAXSCALE_BINDIR})
 
-add_executable(maxkeys maxkeys.c secrets.c utils.c gwdirs.c)
+add_executable(maxkeys maxkeys.c secrets.c utils.c gwdirs.c random_jkiss.c)
 target_link_libraries(maxkeys log_manager utils pthread  crypt crypto)
 install(TARGETS maxkeys DESTINATION ${MAXSCALE_BINDIR})
 
-add_executable(maxpasswd maxpasswd.c secrets.c utils.c gwdirs.c)
+add_executable(maxpasswd maxpasswd.c secrets.c utils.c gwdirs.c random_jkiss.c)
 target_link_libraries(maxpasswd log_manager utils pthread crypt crypto)
 install(TARGETS maxpasswd DESTINATION ${MAXSCALE_BINDIR})
 
diff --git a/server/core/poll.c b/server/core/poll.c
index 5a9c72829..e0bcb0d0c 100644
--- a/server/core/poll.c
+++ b/server/core/poll.c
@@ -1135,7 +1135,7 @@ poll_dcb_session_check(DCB *dcb)
         LOGIF(LE, (skygw_log_write_flush(
             LOGFILE_ERROR,
             "%lu [%s] The dcb %p that was about to be processed does not "
-            "have a non-null session pointer "
+            "have a non-null session pointer ",
             pthread_self(),
             __func__,
             dcb)));
diff --git a/server/core/random_jkiss.c b/server/core/random_jkiss.c
index 37e008612..a4443890b 100644
--- a/server/core/random_jkiss.c
+++ b/server/core/random_jkiss.c
@@ -38,6 +38,8 @@
 static unsigned int x = 123456789,y = 987654321,z = 43219876,c = 6543217; /* Seed variables */
 static bool init = false;
 
+static void random_init_jkiss();
+
 /***
  * 
  * Return a random number
@@ -94,4 +96,4 @@ random_init_jkiss()
     if ((newrand = random_devrand()) != 0) 
         c = newrand % 698769068 + 1; /* Should be less than 698769069 */
     for (i = 0; i < 1000; i++) random_jkiss();
-}
\ No newline at end of file
+}