diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 7050654f9..191249d1e 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -4560,7 +4560,7 @@ static void message_state_changed(LinphoneChatMessage* msg, LinphoneChatMessageS
 	LinphoneJavaBindings *ljb = (LinphoneJavaBindings *)linphone_core_get_user_data(lc);
 	env->CallVoidMethod(listener, method, jmessage, env->CallStaticObjectMethod(ljb->chatMessageStateClass, ljb->chatMessageStateFromIntId, (jint)state));
 
-	if (state == LinphoneChatMessageStateDelivered || state == LinphoneChatMessageStateNotDelivered) {
+	if (state == LinphoneChatMessageStateDisplayed || state == LinphoneChatMessageStateNotDelivered) {
 		env->DeleteGlobalRef(listener);
 		msg->message_state_changed_user_data = NULL;
 	}
@@ -4723,7 +4723,7 @@ static void chat_room_impl_callback(LinphoneChatMessage* msg, LinphoneChatMessag
 			jmessage,
 			env->CallStaticObjectMethod(ljb->chatMessageStateClass,ljb->chatMessageStateFromIntId,(jint)state));
 
-	if (state == LinphoneChatMessageStateDelivered || state == LinphoneChatMessageStateNotDelivered) {
+	if (state == LinphoneChatMessageStateDisplayed || state == LinphoneChatMessageStateNotDelivered) {
 		env->DeleteGlobalRef(listener);
 		env->DeleteGlobalRef(jmessage);
 		linphone_chat_message_set_user_data(msg,NULL);
diff --git a/daemon/daemon.cc b/daemon/daemon.cc
index 6308afe42..757276d29 100644
--- a/daemon/daemon.cc
+++ b/daemon/daemon.cc
@@ -679,7 +679,7 @@ string Daemon::readPipe() {
 					close(childfd);
 				} else {
 					mChildFd = (ortp_pipe_t)childfd;
-					return NULL;
+					return "";
 				}
 			}
 		}
@@ -692,7 +692,7 @@ string Daemon::readPipe() {
 					ms_message("Client disconnected");
 					ortp_server_pipe_close_client(mChildFd);
 					mChildFd = (ortp_pipe_t)-1;
-					return NULL;
+					return "";
 				}
 				buffer[ret] = '\0';
 				return buffer;
@@ -700,7 +700,7 @@ string Daemon::readPipe() {
 		}
 	}
 #endif
-	return NULL;
+	return "";
 }
 
 void Daemon::dumpCommandsHelp() {
diff --git a/wrappers/cpp/CMakeLists.txt b/wrappers/cpp/CMakeLists.txt
index 06979e588..033d9578b 100644
--- a/wrappers/cpp/CMakeLists.txt
+++ b/wrappers/cpp/CMakeLists.txt
@@ -1,4 +1,24 @@
-configure_file(LinphoneCxxConfig.cmake.in LinphoneCxxConfig.cmake @ONLY)
+############################################################################
+# CMakeLists.txt
+# Copyright (C) 2017  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+############################################################################
 
 add_custom_command(OUTPUT include/linphone++/linphone.hh src/linphone++.cc
 	COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/genwrapper.py" "${PROJECT_BINARY_DIR}/coreapi/help/doc/xml"
@@ -44,8 +64,14 @@ write_basic_package_version_file(
 export(EXPORT LinphoneCxxTargets
 	FILE "${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxTargets.cmake"
 )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxVersion.cmake
-	${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxTargets.cmake
-	${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxConfig.cmake
-	DESTINATION ${CMAKE_INSTALL_DATADIR}/LinphoneCxx/cmake
+configure_file(LinphoneCxxConfig.cmake.in LinphoneCxxConfig.cmake @ONLY)
+
+install(EXPORT LinphoneCxxTargets
+	FILE LinphoneCxxTargets.cmake
+	DESTINATION "${CMAKE_INSTALL_DATADIR}/LinphoneCxx/cmake"
+)
+install(FILES
+	"${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxConfig.cmake"
+	"${CMAKE_CURRENT_BINARY_DIR}/LinphoneCxxVersion.cmake"
+	DESTINATION "${CMAKE_INSTALL_DATADIR}/LinphoneCxx/cmake"
 )