diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 3b47af42c..517af502d 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -981,7 +981,7 @@ void linphone_proxy_config_write_to_config_file(LpConfig *config, LinphoneProxyC
 		lp_config_set_string(config,key,"reg_identity",obj->reg_identity);
 	}
 	if (obj->contact_params!=NULL){
-		lp_config_set_string(config,key,"contact_params",obj->contact_params);
+		lp_config_set_string(config,key,"contact_parameters",obj->contact_params);
 	}
 	lp_config_set_int(config,key,"reg_expires",obj->expires);
 	lp_config_set_int(config,key,"reg_sendregister",obj->reg_sendregister);
diff --git a/mediastreamer2 b/mediastreamer2
index 9c3f1bdf1..bd15866ce 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 9c3f1bdf1f7b51c5eeb020f68ef9a4019c66cc52
+Subproject commit bd15866cec3c7b74b359e7a22598c017baf7043e
diff --git a/oRTP b/oRTP
index 59ff6bb7a..e6436672c 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 59ff6bb7a0c5047526b802d264f6db4faa2bd5c2
+Subproject commit e6436672ca7457863f898f0157fa1bd9786051a6
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9e0c94550..e906e29b0 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,9 +7,9 @@ AM_CPPFLAGS=\
 
 COMMON_CFLAGS=\
 	-DIN_LINPHONE \
-	$(LIBXML2_CFLAGS) \
 	$(ORTP_CFLAGS) \
-	$(STRICT_OPTIONS)
+	$(STRICT_OPTIONS) \
+	$(LIBXML2_CFLAGS) 
 
 if BUILD_TOOLS
 
@@ -21,8 +21,8 @@ libxml2lpc_la_SOURCES=\
 
 libxml2lpc_la_CFLAGS=$(COMMON_CFLAGS)
 libxml2lpc_la_LIBADD=\
-	$(LIBXML2_LIBS) \
-	$(top_builddir)/coreapi/liblinphone.la
+	$(top_builddir)/coreapi/liblinphone.la \
+	$(LIBXML2_LIBS) 
 
 libxml2lpc_la_LDFLAGS=-no-undefined
 
@@ -33,7 +33,8 @@ xml2lpc_test_SOURCES=\
 
 xml2lpc_test_CFLAGS=$(COMMON_CFLAGS)
 xml2lpc_test_LDADD=\
-	libxml2lpc.la
+	$(top_builddir)/coreapi/liblinphone.la \
+	libxml2lpc.la 
 
 endif