diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60f801a..1eceaff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ else()
 			link_directories(/usr/local/lib)
 		endif()
 	else()
-		set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:\$ORIGIN/lib")
+		set(CMAKE_INSTALL_RPATH "\$ORIGIN/lib")
 	endif()
 	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
 endif()
diff --git a/qglview/qglview.cpp b/qglview/qglview.cpp
index 6f73dd6..abd8d3d 100644
--- a/qglview/qglview.cpp
+++ b/qglview/qglview.cpp
@@ -833,6 +833,7 @@ QByteArray QGLView::saveFeatures() {
 	QByteArray ba;
 	QDataStream ds(&ba, QIODevice::WriteOnly);
 	ds << features_;
+	return ba;
 }