diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index be84c6341..a307a1c5f 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -333,7 +333,8 @@ static void call_accepted(SalOp *op){
 			}
 			linphone_core_update_streams (lc,call,md);
 			linphone_call_set_state(call, LinphoneCallStreamsRunning, "Streams running");
-			lc->current_call=call;
+			if (!call->current_params.in_conference)
+				lc->current_call=call;
 		}
 	}else{
 		/*send a bye*/
@@ -391,7 +392,8 @@ static void call_updating(SalOp *op){
 				if(lc->vtable.display_status)
 					lc->vtable.display_status(lc,_("We have been resumed..."));
 				linphone_call_set_state (call,LinphoneCallStreamsRunning,"Connected (streams running)");
-				lc->current_call=call;
+				if (!call->current_params.in_conference)
+					lc->current_call=call;
 			}else{
 				prevstate=call->state;
 				linphone_call_set_state(call, LinphoneCallUpdatedByRemote,"Call updated by remote");
diff --git a/coreapi/lsd.c b/coreapi/lsd.c
index f22a5b207..e47023f4f 100644
--- a/coreapi/lsd.c
+++ b/coreapi/lsd.c
@@ -215,7 +215,7 @@ bool_t lsd_player_loop_enabled(const LsdPlayer *p){
 void lsd_player_set_gain(LsdPlayer *p, float gain){
 	MSAudioMixerCtl gainctl;
 	gainctl.pin=p->mixer_pin;
-	gainctl.gain=gain;
+	gainctl.param.gain=gain;
 	ms_filter_call_method(p->lsd->mixer,MS_AUDIO_MIXER_SET_INPUT_GAIN,&gainctl);
 }
 
diff --git a/gtk/main.c b/gtk/main.c
index e3a7b2742..064d857ab 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define chdir _chdir
 #endif
 
-#if defined HAVE_NOTIFY1 || defined HAVE_NOTIFIED4
+#if defined(HAVE_NOTIFY1) || defined(HAVE_NOTIFY4)
 #define HAVE_NOTIFY
 #endif
 
diff --git a/gtk/singleinstance.c b/gtk/singleinstance.c
index d92749e95..428439e6a 100644
--- a/gtk/singleinstance.c
+++ b/gtk/singleinstance.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "linphone.h"
 
 static ms_thread_t pipe_thread;
-static ortp_pipe_t server_pipe=-1;
+static ortp_pipe_t server_pipe=(ortp_pipe_t)-1;
 static gboolean server_pipe_running=TRUE;
 static char *pipe_name;
 
@@ -38,7 +38,7 @@ static void * server_pipe_thread(void *pointer){
 	
 	do{
 		child=ortp_server_pipe_accept_client(server_pipe);
-		if (server_pipe_running && child!=-1){
+		if (server_pipe_running && child!=(ortp_pipe_t)-1){
 			char buf[256]={0};
 			if (ortp_pipe_read(child,(uint8_t*)buf,sizeof(buf))>0){
 				g_message("Received wakeup command with arg %s",buf);
@@ -56,7 +56,7 @@ static void * server_pipe_thread(void *pointer){
 static void linphone_gtk_init_pipe(const char *name){
 	pipe_name=g_strdup(name);
 	server_pipe=ortp_server_pipe_create(name);
-	if (server_pipe==-1){
+	if (server_pipe==(ortp_pipe_t)-1){
 		g_warning("Fail to create server pipe for name %s: %s",name,strerror(errno));
 	}
 	ms_thread_create(&pipe_thread,NULL,server_pipe_thread,NULL);
@@ -64,7 +64,7 @@ static void linphone_gtk_init_pipe(const char *name){
 
 bool_t linphone_gtk_init_instance(const char *app_name, const char *addr_to_call){
 	ortp_pipe_t p=ortp_client_pipe_connect(app_name);
-	if (p!=-1){
+	if (p!=(ortp_pipe_t)-1){
 		uint8_t buf[256]={0};
 		g_message("There is already a running instance.");
 		if (addr_to_call!=NULL){
@@ -84,7 +84,7 @@ bool_t linphone_gtk_init_instance(const char *app_name, const char *addr_to_call
 }
 
 void linphone_gtk_uninit_instance(void){
-	if (server_pipe!=-1){
+	if (server_pipe!=(ortp_pipe_t)-1){
 		ortp_pipe_t client;
 		server_pipe_running=FALSE;
 		/*this is to unblock the accept() of the server pipe*/
@@ -92,7 +92,7 @@ void linphone_gtk_uninit_instance(void){
 		ortp_pipe_write(client,(uint8_t*)" ",1);
 		ortp_client_pipe_close(client);
 		ms_thread_join(pipe_thread,NULL);
-		server_pipe=-1;
+		server_pipe=(ortp_pipe_t)-1;
 		g_free(pipe_name);
 		pipe_name=NULL;
 	}
diff --git a/mediastreamer2 b/mediastreamer2
index 5d3427468..28a643d20 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 5d342746830a6cc2aec1d3abb2d9abb898925292
+Subproject commit 28a643d20f6d6384d96590ab6e988928597878cf
diff --git a/oRTP b/oRTP
index a56d7f752..845e0cf4e 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit a56d7f752717bea7d92cf63a6d187c2f6361d38b
+Subproject commit 845e0cf4e33cc9964c48aa9191005d4108dfebbd