diff --git a/console/commands.c b/console/commands.c
index 7c5b519d8..9f6d0c1c2 100644
--- a/console/commands.c
+++ b/console/commands.c
@@ -1601,7 +1601,7 @@ linphonec_proxy_add(LinphoneCore *lc)
 	 */
 	if ( enable_register==TRUE )
 	{
-		long int expires=0;
+		int expires=0;
 		while (1)
 		{
 			char *input=linphonec_readline("Specify register expiration time"
@@ -1613,13 +1613,8 @@ linphonec_proxy_add(LinphoneCore *lc)
 				return;
 			}
 
-			expires=strtol(input, (char **)NULL, 10);
-			if ( expires == LONG_MIN || expires == LONG_MAX )
-			{
-				linphonec_out("Invalid value: %s\n", strerror(errno));
-				free(input);
-				continue;
-			}
+			expires=atoi(input);
+			if (expires==0) expires=600;
 
 			linphone_proxy_config_set_expires(cfg, expires);
 			linphonec_out("Expiration: %d seconds\n", linphone_proxy_config_get_expires (cfg));
diff --git a/console/linphonec.c b/console/linphonec.c
index 1a800fd2b..efa8ceab4 100644
--- a/console/linphonec.c
+++ b/console/linphonec.c
@@ -805,6 +805,7 @@ linphonec_finish(int exit_status)
 	if (mylogfile != NULL && mylogfile != stdout)
 	{
 		fclose (mylogfile);
+		mylogfile=stdout;
 	}
 	printf("\n");
 	exit(exit_status);
diff --git a/mediastreamer2 b/mediastreamer2
index 338398a4e..4464c0944 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 338398a4eee9b44dfeb2c18b735bf42cc2b9e93c
+Subproject commit 4464c094410dd4396b3563798031ed50ae90d8c8