diff --git a/coreapi/bellesip_sal/sal_op_call.c b/coreapi/bellesip_sal/sal_op_call.c
index f9cb812fe..43ae70aaa 100644
--- a/coreapi/bellesip_sal/sal_op_call.c
+++ b/coreapi/bellesip_sal/sal_op_call.c
@@ -81,13 +81,14 @@ static void sdp_process(SalOp *h){
 static int set_sdp(belle_sip_message_t *msg,belle_sdp_session_description_t* session_desc) {
 	belle_sip_header_content_type_t* content_type ;
 	belle_sip_header_content_length_t* content_length;
-	int length;
+	belle_sip_error_code error = BELLE_SIP_OK;
+	unsigned int length = 0;
 	char buff[2048];
 
 	if (session_desc) {
 		content_type = belle_sip_header_content_type_create("application","sdp");
-		length = belle_sip_object_marshal(BELLE_SIP_OBJECT(session_desc),buff,0,sizeof(buff));
-		if (length>=sizeof(buff)) {
+		error = belle_sip_object_marshal(BELLE_SIP_OBJECT(session_desc),buff,sizeof(buff),&length);
+		if (error != BELLE_SIP_OK) {
 			ms_error("Buffer too small or sdp too big");
 			return -1;
 		}
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index c6915a32c..6848b4f43 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -1400,8 +1400,8 @@ LINPHONE_PUBLIC void linphone_core_set_preferred_video_size_by_name(LinphoneCore
 void linphone_core_enable_video_preview(LinphoneCore *lc, bool_t val);
 bool_t linphone_core_video_preview_enabled(const LinphoneCore *lc);
 
-void linphone_core_enable_self_view(LinphoneCore *lc, bool_t val);
-bool_t linphone_core_self_view_enabled(const LinphoneCore *lc);
+LINPHONE_PUBLIC void linphone_core_enable_self_view(LinphoneCore *lc, bool_t val);
+LINPHONE_PUBLIC bool_t linphone_core_self_view_enabled(const LinphoneCore *lc);
 
 
 /* returns a null terminated static array of string describing the webcams */