diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index de2061555..c19c5e094 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -5502,7 +5502,7 @@ static void sound_config_uninit(LinphoneCore *lc)
 
 	if (config->local_ring) ms_free(config->local_ring);
 	if (config->remote_ring) ms_free(config->remote_ring);
-	ms_snd_card_manager_destroy();
+
 }
 
 static void video_config_uninit(LinphoneCore *lc)
@@ -5657,7 +5657,7 @@ static void linphone_core_uninit(LinphoneCore *lc)
 	linphone_core_free_payload_types(lc);
 	
 	linphone_core_message_storage_close(lc);
-	ortp_exit();
+	ms_exit();
 	linphone_core_set_state(lc,LinphoneGlobalOff,"Off");
 }
 
diff --git a/mediastreamer2 b/mediastreamer2
index 25d5fc4a3..b2dc80f2d 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 25d5fc4a3383c3eeb79193bb31f1d2f123246dfd
+Subproject commit b2dc80f2de024dc8a40fc92043e63f4e4f0669aa