diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b70545e0..b61fc864f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,8 +87,8 @@ endif(BUILD_RABBITMQ)
 file(GLOB DOCS Documentation/*.pdf)
 
 if( NOT ( (DEFINED INSTALL_SYSTEM_FILES) AND ( NOT ( INSTALL_SYSTEM_FILES ) ) ) )
-  install(FILES maxscale.conf DESTINATION /etc/ld.so.conf.d)
-  install(FILES etc/init.d/maxscale DESTINATION /etc/init.d)
+  install(FILES maxscale.conf DESTINATION /etc/ld.so.conf.d/)
+  install(FILES etc/init.d/maxscale DESTINATION /etc/init.d/ PERMISSIONS WORLD_EXECUTE)
   message(STATUS "Installing maxscale.conf to: /etc/ld.so.conf.d")
   message(STATUS "Installing startup scripts to: /etc/init.d")
 endif()
@@ -110,7 +110,7 @@ set(CPACK_PACKAGE_FILE_NAME "maxscale-${MAXSCALE_VERSION}")
 set(CPACK_PACKAGE_NAME "maxscale")
 set(CPACK_PACKAGE_VENDOR "SkySQL Ab")
 set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README)
-set(CPACK_PACKAGING_INSTALL_PREFIX "/")
+set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
 set(CPACK_RPM_SPEC_INSTALL_POST "/sbin/ldconfig")
 set(CPACK_RPM_PACKAGE_NAME "maxscale")
 set(CPACK_RPM_PACKAGE_VENDOR "SkySQL Ab")
diff --git a/README b/README
index c1de0d92d..baac5e61e 100644
--- a/README
+++ b/README
@@ -189,7 +189,7 @@ All the parameters affecting CMake can be found in 'macros.cmake'. This file als
 Variables controlling the CMake build process:
 
 INSTALL_DIR=<path>			Installation directory
-BUILD_TYPE=[Debug|Release]		Type of the build, defaults to Release
+BUILD_TYPE=[None|Debug|Release]		Type of the build, defaults to Release (optimized)
 INSTALL_SYSTEM_FILES=[Y|N]		Install startup scripts and ld configuration files
 EMBEDDED_LIB=<path>			Path to the embedded library, filename included
 MYSQL_DIR=<path>			Path to MySQL headers
diff --git a/etc/init.d/maxscale.in b/etc/init.d/maxscale.in
old mode 100644
new mode 100755
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
index 27a8c5efd..eca007b98 100644
--- a/server/test/CMakeLists.txt
+++ b/server/test/CMakeLists.txt
@@ -5,4 +5,4 @@ set_tests_properties(RunExecutable PROPERTIES TIMEOUT 5)
 set_tests_properties(RunExecutable PROPERTIES WILL_FAIL TRUE)
 
 add_test(NAME KillExecutable COMMAND killall -KILL maxscale)
-set_tests_properties(KillExecutable PROPERTIES COST 0.00001)
+set_tests_properties(KillExecutable PROPERTIES COST 100000)