diff --git a/Documentation/Documentation-Contents.md b/Documentation/Documentation-Contents.md
index 3c80241cf..74969c7d1 100644
--- a/Documentation/Documentation-Contents.md
+++ b/Documentation/Documentation-Contents.md
@@ -34,7 +34,7 @@
  - [Filter Tutorial](Tutorials/Filter-Tutorial.md)
  - [Galera Cluster Connection Routing Tutorial](Tutorials/Galera-Cluster-Connection-Routing-Tutorial.md)
  - [Galera Cluster Read-Write Splitting Tutorial](Tutorials/Galera-Cluster-Read-Write-Splitting-Tutorial.md)
- - [MaxScale Information Schema Tutorial](Tutorials/MaxScale-Informaton-Schema.md)
+ - [MaxScale Information Schema Tutorial](Tutorials/MaxScale-Information-Schema.md)
  - [MySQL Replication Connection Routing Tutorial](Tutorials/MySQL-Replication-Connection-Routing-Tutorial.md)
  - [MySQL Replication Read-Write Splitting Tutorial](Tutorials/MySQL-Replication-Read-Write-Splitting-Tutorial.md)
  - [MySQL Cluster Setup](Tutorials/MySQL-Cluster-Setup.md)
diff --git a/macros.cmake b/macros.cmake
index 2839859cc..9683a88f6 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -262,20 +262,22 @@ debugmsg("Search returned: ${MYSQL_DIR_LOC}")
 
 
   # Check which init.d script to install
-  find_file(RPM_FNC functions PATHS /etc/rc.d/init.d)
-  if(${RPM_FNC} MATCHES "RPM_FNC-NOTFOUND")
-	find_file(DEB_FNC init-functions PATHS /lib/lsb)
-	if(${DEB_FNC} MATCHES "DEB_FNC-NOTFOUND")
-	  set(DEPS_OK FALSE CACHE BOOL "If all the dependencies were found.")
-	  message(FATAL_ERROR "Cannot find required init-functions in /lib/lsb/ or /etc/rc.d/init.d/, please confirm that your system files are OK.")
-	else()
-	  set(DEB_BASED TRUE CACHE BOOL "If init.d script uses /lib/lsb/init-functions instead of /etc/rc.d/init.d/functions.")
-	endif()
-  else()
-	set(DEB_BASED FALSE CACHE BOOL "If init.d script uses /lib/lsb/init-functions instead of /etc/rc.d/init.d/functions.")
+  if(WITH_SCRIPTS)
+    find_file(RPM_FNC functions PATHS /etc/rc.d/init.d)
+    if(${RPM_FNC} MATCHES "RPM_FNC-NOTFOUND")
+      find_file(DEB_FNC init-functions PATHS /lib/lsb)
+      if(${DEB_FNC} MATCHES "DEB_FNC-NOTFOUND")
+	set(DEPS_OK FALSE CACHE BOOL "If all the dependencies were found.")
+	message(FATAL_ERROR "Cannot find required init-functions in /lib/lsb/ or /etc/rc.d/init.d/, please confirm that your system files are OK.")
+      else()
+	set(DEB_BASED TRUE CACHE BOOL "If init.d script uses /lib/lsb/init-functions instead of /etc/rc.d/init.d/functions.")
+      endif()
+    else()
+      set(DEB_BASED FALSE CACHE BOOL "If init.d script uses /lib/lsb/init-functions instead of /etc/rc.d/init.d/functions.")
+    endif()
+    unset(DEB_FNC)
+    unset(RPM_FNC)
   endif()
-  unset(DEB_FNC)
-  unset(RPM_FNC)
 
   #Check RabbitMQ headers and libraries
   if(BUILD_RABBITMQ)
diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index 40583da93..f3a383c2e 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -1254,4 +1254,4 @@ monitor_clear_pending_status(MONITOR_SERVERS *ptr, int bit)
 {
 	ptr->pending_status &= ~bit;
 }
-y
+
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index 3739eb054..b9beb80d0 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -4384,7 +4384,7 @@ static bool route_session_write(
 		    if(BREF_IS_IN_USE(bref))
 		    {
 
-			if(bref->bref_sescmd_cur.position <= prop->rses_prop_data.sescmd.position)
+			if(bref->bref_sescmd_cur.position <= prop->rses_prop_data.sescmd.position + 1)
 			{
 			    conflict = true;
 			    break;
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 32e680221..7f835c552 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,3 +1,2 @@
 add_library(utils skygw_utils.cc)
-add_dependencies(utils log_manager)
-target_link_libraries(utils stdc++ log_manager)
+target_link_libraries(utils stdc++)