diff --git a/coreapi/bellesip_sal/sal_op_call.c b/coreapi/bellesip_sal/sal_op_call.c
index 86c5460ee..9676c9b73 100644
--- a/coreapi/bellesip_sal/sal_op_call.c
+++ b/coreapi/bellesip_sal/sal_op_call.c
@@ -37,11 +37,11 @@ static void call_set_error(SalOp* op,belle_sip_response_t* response, bool_t fata
 	if (fatal) op->state = SalOpStateTerminating;
 	op->base.root->callbacks.call_failure(op);
 }
-static void set_addr_to_0000(char value[]) {
+static void set_addr_to_0000(char value[], size_t sz) {
 	if (ms_is_ipv6(value)) {
-		strcpy(value,"::0");
+		strncpy(value,"::0", sz);
 	} else {
-		strcpy(value,"0.0.0.0");
+		strncpy(value,"0.0.0.0", sz);
 	}
 	return;
 }
@@ -66,11 +66,11 @@ static void sdp_process(SalOp *h){
 		offer_answer_initiate_incoming(h->base.root->factory, h->base.local_media,h->base.remote_media,h->result,h->base.root->one_matching_codec);
 		/*for backward compatibility purpose*/
 		if(h->cnx_ip_to_0000_if_sendonly_enabled && sal_media_description_has_dir(h->result,SalStreamSendOnly)) {
-			set_addr_to_0000(h->result->addr);
+			set_addr_to_0000(h->result->addr, sizeof(h->result->addr));
 			for(i=0;i<SAL_MEDIA_DESCRIPTION_MAX_STREAMS;++i){
 				if (h->result->streams[i].dir == SalStreamSendOnly) {
-					set_addr_to_0000(h->result->streams[i].rtp_addr);
-					set_addr_to_0000(h->result->streams[i].rtcp_addr);
+					set_addr_to_0000(h->result->streams[i].rtp_addr, sizeof(h->result->streams[i].rtp_addr));
+					set_addr_to_0000(h->result->streams[i].rtcp_addr, sizeof(h->result->streams[i].rtcp_addr));
 				}
 			}
 		}
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 9a40acbc7..99141e869 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -4575,7 +4575,7 @@ extern "C" jboolean Java_org_linphone_core_LinphoneChatMessageImpl_isSecured(JNI
 	return linphone_chat_message_is_secured((LinphoneChatMessage*)ptr);
 }
 
-extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_resend(JNIEnv*  env
+extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_reSend(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr) {
 	linphone_chat_message_resend((LinphoneChatMessage*)ptr);
@@ -4605,7 +4605,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 == LinphoneChatMessageStateDisplayed || state == LinphoneChatMessageStateNotDelivered) {
+	if (state == LinphoneChatMessageStateDisplayed) {
 		env->DeleteGlobalRef(listener);
 		msg->message_state_changed_user_data = NULL;
 	}
@@ -4768,7 +4768,7 @@ static void chat_room_impl_callback(LinphoneChatMessage* msg, LinphoneChatMessag
 			jmessage,
 			env->CallStaticObjectMethod(ljb->chatMessageStateClass,ljb->chatMessageStateFromIntId,(jint)state));
 
-	if (state == LinphoneChatMessageStateDisplayed || state == LinphoneChatMessageStateNotDelivered) {
+	if (state == LinphoneChatMessageStateDisplayed ) {
 		env->DeleteGlobalRef(listener);
 		env->DeleteGlobalRef(jmessage);
 		linphone_chat_message_set_user_data(msg,NULL);
diff --git a/coreapi/payload_type.c b/coreapi/payload_type.c
index 3584b49c3..e53d0739f 100644
--- a/coreapi/payload_type.c
+++ b/coreapi/payload_type.c
@@ -29,7 +29,7 @@ struct _LinphonePayloadType {
 };
 
 BELLE_SIP_DECLARE_NO_IMPLEMENTED_INTERFACES(LinphonePayloadType);
-BELLE_SIP_DECLARE_VPTR(LinphonePayloadType);
+BELLE_SIP_DECLARE_VPTR_NO_EXPORT(LinphonePayloadType);
 
 LinphonePayloadType *linphone_payload_type_new(LinphoneCore *lc, OrtpPayloadType *ortp_pt) {
 	LinphonePayloadType *pt;
diff --git a/linphone.spec.in b/linphone.spec.in
index d0a721233..2bd2843d8 100644
--- a/linphone.spec.in
+++ b/linphone.spec.in
@@ -101,7 +101,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_bindir}/lpc2xml_test
 %{_bindir}/xml2lpc_test
-%{_bindir}/lp-gen-wrappers
 %{_bindir}/lp-sendmsg
 %{_includedir}/linphone
 %{_libdir}/*.a
diff --git a/tools/Makefile.am b/tools/Makefile.am
index afcc52cdb..2531b7b3a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST=xml2lpc_jni.cc lpc2xml_jni.cc
 
 if BUILD_TOOLS
 
-bin_PROGRAMS=xml2lpc_test lpc2xml_test lp-gen-wrappers lp-autoanswer lp-test-ecc lp-sendmsg
+bin_PROGRAMS=xml2lpc_test lpc2xml_test lp-autoanswer lp-test-ecc lp-sendmsg
 
 xml2lpc_test_SOURCES=\
 	xml2lpc_test.c
@@ -36,13 +36,6 @@ lpc2xml_test_CFLAGS=$(COMMON_CFLAGS)
 lpc2xml_test_LDADD=\
 	$(top_builddir)/coreapi/liblinphone.la
 
-lp_gen_wrappers_SOURCES=genwrappers.cc \
-			software-desc.cc software-desc.hh \
-			generator.cc generator.hh
-
-lp_gen_wrappers_LDADD= \
-		$(LIBXML2_LIBS)
-
 lp_autoanswer_SOURCES=auto_answer.c
 lp_autoanswer_CFLAGS=$(COMMON_CFLAGS)
 lp_autoanswer_LDADD=\