diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2727b92e..052ef10d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,12 +7,8 @@ set (CPACK_PACKAGE_VERSION_PATCH "1")
 
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks")
-else()
-	set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib:\$ORIGIN/")
-	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-endif()
+set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib:\$ORIGIN/")
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 set (RAIBLOCKS_GUI OFF CACHE BOOL "")
 set (RAIBLOCKS_TEST OFF CACHE BOOL "")
@@ -70,7 +66,7 @@ endif (WIN32)
 if (WIN32)
 	set (PLATFORM_CXX_FLAGS "/bigobj")
 else (WIN32)
-	set (PLATFORM_CXX_FLAGS "-std=c++11")
+	set (PLATFORM_CXX_FLAGS "-std=c++14")
 endif (WIN32)
 
 if (WIN32)
diff --git a/rai/rai_node/daemon.cpp b/rai/rai_node/daemon.cpp
index 6c84bc3c..181aac00 100644
--- a/rai/rai_node/daemon.cpp
+++ b/rai/rai_node/daemon.cpp
@@ -124,7 +124,7 @@ void rai_daemon::daemon::run (boost::filesystem::path const & data_path)
 				{
 					rpc->start ();
 				}
-				runner.reset (new rai::thread_runner (service, node->config.io_threads));
+				runner = std::make_unique<rai::thread_runner> (service, node->config.io_threads);
 				runner->join ();
 			}
 			else